From 1aea3839242285ec4edf260b32fab765b0c43c8f Mon Sep 17 00:00:00 2001 From: Jakob Klepp <1183303+truh@users.noreply.github.com> Date: Fri, 24 May 2024 12:00:51 +0200 Subject: [PATCH 1/3] Update dependabot_automerge.yml --- .github/workflows/dependabot_automerge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependabot_automerge.yml b/.github/workflows/dependabot_automerge.yml index 5c1ea3f..1b556cc 100644 --- a/.github/workflows/dependabot_automerge.yml +++ b/.github/workflows/dependabot_automerge.yml @@ -16,7 +16,7 @@ jobs: with: github-token: "${{ secrets.GITHUB_TOKEN }}" - name: Enable auto-merge for Dependabot PRs - if: contains(steps.metadata.outputs.dependency-names, 'my-dependency') && steps.metadata.outputs.update-type == 'version-update:semver-patch' + if: steps.metadata.outputs.update-type == 'version-update:semver-patch' run: gh pr merge --auto --merge "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} From 83d87805f06cab904cb063a113d78a0cd0445159 Mon Sep 17 00:00:00 2001 From: Jakob Klepp <1183303+truh@users.noreply.github.com> Date: Fri, 24 May 2024 12:10:13 +0200 Subject: [PATCH 2/3] Don't attic push on PRs from forks --- .github/workflows/build_nix.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_nix.yml b/.github/workflows/build_nix.yml index 497bd77..d610e22 100644 --- a/.github/workflows/build_nix.yml +++ b/.github/workflows/build_nix.yml @@ -35,4 +35,5 @@ jobs: - name: Building package run: nix build .#packages.${{ matrix.system }}.default - name: Push result to cache + if: ${{ github.event.pull_request.head.repo.full_name == 'MoonVision/jira-tools' }} run: nix run nixpkgs#attic-client push moonvision-foss result From c1506a31cb82aac11e8764df1221105d1e03c6b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 May 2024 10:10:59 +0000 Subject: [PATCH 3/3] Bump openssl from 0.10.55 to 0.10.64 Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.55 to 0.10.64. - [Release notes](https://github.com/sfackler/rust-openssl/releases) - [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.55...openssl-v0.10.64) --- updated-dependencies: - dependency-name: openssl dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Cargo.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4ffac19..91decad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -644,7 +644,7 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jira-tools" -version = "0.2.0" +version = "0.2.1" dependencies = [ "config", "env_logger", @@ -874,11 +874,11 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.3.3", "cfg-if 1.0.0", "foreign-types", "libc", @@ -906,9 +906,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc",