diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ae15b92..d11d0d1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -13,7 +13,7 @@ concurrency: cancel-in-progress: true jobs: - latest: + tests: name: PHP ${{ matrix.php }} runs-on: ubuntu-latest strategy: @@ -32,9 +32,25 @@ jobs: coverage: none - name: Checkout code - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false - name: Execute tests run: make phpcs + + dependabot-automerge: + name: Auto-merge Dependabot PRs + needs: tests # only on successful tests + runs-on: ubuntu-latest + + permissions: + pull-requests: write # needed so dependabot can approve + contents: write # needed so dependabot can merge + + steps: + - name: Auto-merge Dependabot PRs + uses: fastify/github-action-merge-dependabot@1b2ed42db8f9d81a46bac83adedfc03eb5149dff # v3 + with: + # only automerge patch & minor semver bumps + target: minor diff --git a/.github/workflows/dependabot-automerge.yml b/.github/workflows/dependabot-automerge.yml deleted file mode 100644 index 516c1be..0000000 --- a/.github/workflows/dependabot-automerge.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: Dependabot - -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - -permissions: {} - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - dependabot-automerge: - name: Auto-merge Dependabot PRs - needs: tests # only on successful tests - runs-on: ubuntu-latest - - permissions: - pull-requests: write # needed so dependabot can approve - contents: write # needed so dependabot can merge - - steps: - - name: Auto-merge Dependabot PRs - uses: fastify/github-action-merge-dependabot@1b2ed42db8f9d81a46bac83adedfc03eb5149dff # v3 - with: - # only automerge patch & minor semver bumps - target: minor diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d4e9300..11c18e0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,7 @@ jobs: ini-values: phar.readonly=0 - name: Checkout Code - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false