Merge branch 'main' into update-cargo-lock-2024-05-24

MoonVision · May 24, 2024 · 4597f6c · 4597f6c
2 parents 7c64820 + 83d8780
commit 4597f6c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
diff --git 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}}