From 863ecbfb319bcb40dd95337bf497bbfd7070aac9 Mon Sep 17 00:00:00 2001 From: Yoanm <4410697+yoanm@users.noreply.github.com> Date: Tue, 2 Sep 2025 07:29:37 +0200 Subject: [PATCH 1/3] Dependabot auto-merge --- .github/workflows/CI.yml | 1 + .github/workflows/auto-merge-dependabot.yml | 26 +++++++++++++++++++++ .github/workflows/pre-check-CI-updates.yml | 1 + 3 files changed, 28 insertions(+) create mode 100644 .github/workflows/auto-merge-dependabot.yml diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 9e9f7b5..881b77a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -14,6 +14,7 @@ on: # Build any PRs and main branch changes - '.github/workflows/coverage-upload.yml' - '.github/workflows/reusable-CI-workflow.yml' - '.github/workflows/reusable-coverage-upload-workflow.yml' + - '.github/workflows/auto-merge-dependabot.yml' push: branches: [ master ] schedule: diff --git a/.github/workflows/auto-merge-dependabot.yml b/.github/workflows/auto-merge-dependabot.yml new file mode 100644 index 0000000..64639c8 --- /dev/null +++ b/.github/workflows/auto-merge-dependabot.yml @@ -0,0 +1,26 @@ +name: PR auto-merge +on: pull_request + +permissions: + contents: write + pull-requests: write + +jobs: + dependabot: + if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'yoanm/php-jsonrpc-server-doc-sdk' + runs-on: ubuntu-latest + permissions: + contents: write + pull-requests: write + steps: + - name: Dependabot metadata + id: metadata + uses: dependabot/fetch-metadata@v2.4.0 + with: + github-token: "${{ secrets.GITHUB_TOKEN }}" + - name: Enable auto-merge for Dependabot PRs + if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.update-type == 'version-update:semver-patch'}} + run: gh pr merge --auto --squash "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/pre-check-CI-updates.yml b/.github/workflows/pre-check-CI-updates.yml index ef2c3c4..63b9f89 100644 --- a/.github/workflows/pre-check-CI-updates.yml +++ b/.github/workflows/pre-check-CI-updates.yml @@ -16,6 +16,7 @@ on: - '.github/workflows/coverage-upload.yml' - '.github/workflows/reusable-CI-workflow.yml' - '.github/workflows/reusable-coverage-upload-workflow.yml' + - '.github/workflows/auto-merge-dependabot.yml' permissions: contents: read From 4a9d89fcdce030f24c5cf9a069432517d93c93c8 Mon Sep 17 00:00:00 2001 From: Yoanm <4410697+yoanm@users.noreply.github.com> Date: Tue, 2 Sep 2025 10:30:32 +0200 Subject: [PATCH 2/3] Fix --- .github/workflows/auto-merge-dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-merge-dependabot.yml b/.github/workflows/auto-merge-dependabot.yml index 64639c8..a7ad5dd 100644 --- a/.github/workflows/auto-merge-dependabot.yml +++ b/.github/workflows/auto-merge-dependabot.yml @@ -7,7 +7,7 @@ permissions: jobs: dependabot: - if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'yoanm/php-jsonrpc-server-doc-sdk' + if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'yoanm/php-jsonrpc-params-symfony-constraint-doc-sdk' runs-on: ubuntu-latest permissions: contents: write From 2f5027423373c6d5575dfe86d534003ffbdef7bf Mon Sep 17 00:00:00 2001 From: Yoanm <4410697+yoanm@users.noreply.github.com> Date: Tue, 2 Sep 2025 10:41:36 +0200 Subject: [PATCH 3/3] Remove useless restrictions --- .github/workflows/CI.yml | 3 --- .github/workflows/pre-check-CI-updates.yml | 3 --- 2 files changed, 6 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 881b77a..b262c39 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -10,11 +10,8 @@ on: # Build any PRs and main branch changes # In case of updates to those workflows, they must be pre-checked by `pre-check-CI-updates.yml` rather than this workflow ! # Any updates on those workflows are expected to be restricted to those workflows only ! (no update on code for instance) - '.github/workflows/pre-check-CI-updates.yml' - - '.github/workflows/CI.yml' - - '.github/workflows/coverage-upload.yml' - '.github/workflows/reusable-CI-workflow.yml' - '.github/workflows/reusable-coverage-upload-workflow.yml' - - '.github/workflows/auto-merge-dependabot.yml' push: branches: [ master ] schedule: diff --git a/.github/workflows/pre-check-CI-updates.yml b/.github/workflows/pre-check-CI-updates.yml index 63b9f89..4dde12e 100644 --- a/.github/workflows/pre-check-CI-updates.yml +++ b/.github/workflows/pre-check-CI-updates.yml @@ -12,11 +12,8 @@ on: branches: [master] # Only for PR targeting master branch paths: # /!\ Duplicate the same list as `on.pull_request.paths-ignore` property value for CI workflow ! - '.github/workflows/pre-check-CI-updates.yml' # This workflow - - '.github/workflows/CI.yml' - - '.github/workflows/coverage-upload.yml' - '.github/workflows/reusable-CI-workflow.yml' - '.github/workflows/reusable-coverage-upload-workflow.yml' - - '.github/workflows/auto-merge-dependabot.yml' permissions: contents: read