diff --git a/.github/actions-lock.txt b/.github/actions-lock.txt index c89a72fb..36f4be41 100644 --- a/.github/actions-lock.txt +++ b/.github/actions-lock.txt @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors # SPDX-License-Identifier: MIT f776ffe8120cb9a8b2579bc30a7f7ca7 appstore-build-publish.yml -cbffe424c47647a2e375f96f25b67af9 dependabot-approve-merge.yml +7dd8d21d9dd013196cd4bdbf7c24db6f dependabot-approve-merge.yml 2581a67c5bcdcd570427e6d51db767d7 fixup.yml 80a58e5584612def0e751fcfb7669814 lint-info-xml.yml ccd8a55c60e35b84becb0f7005ce1286 lint-php-cs.yml @@ -15,5 +15,5 @@ ec7d1084fbb3a6803dbabf3acdd17ac8 phpunit-oci.yml 2070d9569f327e758b9ce2b924c28fef psalm.yml 7db5b820f3750eebe988005a0bb2febd reuse.yml 800d5b188aa885626cf4169fa2dfea9e update-nextcloud-ocp-approve-merge.yml -1a3e76e59e411598dbf3042cd687ec33 update-nextcloud-ocp.yml -9748607544294975609be21633372bdd sync-workflow-templates.yml +595e7ba6f8f494268c3309ab7e3825f2 update-nextcloud-ocp.yml +a064cb13abb8fa131c50af7f826f0331 sync-workflow-templates.yml diff --git a/.github/workflows/dependabot-approve-merge.yml b/.github/workflows/dependabot-approve-merge.yml index f84397b8..71261f46 100644 --- a/.github/workflows/dependabot-approve-merge.yml +++ b/.github/workflows/dependabot-approve-merge.yml @@ -53,6 +53,6 @@ jobs: # Enable GitHub auto merge - name: Auto merge uses: alexwilson/enable-github-automerge-action@56e3117d1ae1540309dc8f7a9f2825bc3c5f06ff # v2.0.0 - if: startsWith(steps.branchname.outputs.branch, 'dependabot/') + if: startsWith(steps.branchname.outputs.branch, 'dependabot/') && (github.event.pull_request.action == 'opened' || github.event.pull_request.action == 'reopened') with: github-token: ${{ secrets.GITHUB_TOKEN }}