From ae0d19ac0e3fc3a467e7c1eecb1d208dd386141e Mon Sep 17 00:00:00 2001 From: Yoanm <4410697+yoanm@users.noreply.github.com> Date: Fri, 29 Aug 2025 22:15:59 +0200 Subject: [PATCH 1/2] Dependabot auto-merge --- .github/workflows/CI.yml | 1 + .github/workflows/auto-merge-dependabot.yml | 23 +++++++++++++++++++++ .github/workflows/pre-check-CI-updates.yml | 1 + 3 files changed, 25 insertions(+) create mode 100644 .github/workflows/auto-merge-dependabot.yml diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index dfaa0eb2..496d2580 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 00000000..bed36d80 --- /dev/null +++ b/.github/workflows/auto-merge-dependabot.yml @@ -0,0 +1,23 @@ +name: PR auto-merge +on: pull_request + +permissions: + contents: write + pull-requests: write + +jobs: + dependabot: + runs-on: ubuntu-latest + if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'yoanm/php-jsonrpc-server-sdk' + 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 6ab9d7cd..8ec496d6 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' concurrency: group: "${{ github.workflow }}-${{ github.head_ref || github.ref }}" From a4a013fd3b3f5a29156bbb2f4f2b79e797ef6b04 Mon Sep 17 00:00:00 2001 From: Yoanm <4410697+yoanm@users.noreply.github.com> Date: Fri, 29 Aug 2025 22:34:46 +0200 Subject: [PATCH 2/2] Fix behat coverage --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6f606a74..e92d0a86 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ "ext-json": "*" }, "require-dev": { - "behat/behat": "^3.9.0", + "behat/behat": "^3.9.0,<=3.16.1", "coduo/php-matcher": "^6.0", "dvdoug/behat-code-coverage": "^5.0", "phpspec/prophecy": "^1.15",