From 67cc3f134f687aa7d02323bf93e0b69a42ba2cb2 Mon Sep 17 00:00:00 2001 From: Philippe Charles Date: Mon, 25 Sep 2023 09:01:19 +0200 Subject: [PATCH] Add auto-merge on dependabot PR --- .github/workflows/java-maven.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/java-maven.yml b/.github/workflows/java-maven.yml index 25c2b58..3aa58e6 100644 --- a/.github/workflows/java-maven.yml +++ b/.github/workflows/java-maven.yml @@ -4,7 +4,7 @@ on: [ push, pull_request ] jobs: build-and-test-job: - if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name + if: github.event_name == 'pull_request' || startsWith(github.ref, 'refs/heads/develop') || startsWith(github.ref, 'refs/tags/v') strategy: fail-fast: false matrix: @@ -36,6 +36,23 @@ jobs: with: run: mvn -U -B -ntp package + auto-merge-job: + needs: build-and-test-job + if: startsWith(github.repository, 'jdemetra/') && github.event_name == 'pull_request' && github.actor == 'dependabot[bot]' + permissions: + contents: write + pull-requests: write + + name: Auto-merge on dependabot PR + runs-on: ubuntu-latest + + steps: + - name: Merge PR + run: gh pr merge --auto --rebase "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} + snapshot-job: needs: build-and-test-job if: startsWith(github.repository, 'jdemetra/') && startsWith(github.ref, 'refs/heads/develop')