From 035c8b45448680eda998a48fd8875897ff8718ab Mon Sep 17 00:00:00 2001 From: Chintan Radia Date: Sat, 19 Mar 2022 11:52:44 +0530 Subject: [PATCH 1/2] Fixes #1081 : Move dependabot job to run after all other jobs --- .github/workflows/dependabot-auto-merge.yml | 19 ------------------- .github/workflows/github-actions.yml | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 19 deletions(-) delete mode 100644 .github/workflows/dependabot-auto-merge.yml diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml deleted file mode 100644 index f66d56384bd..00000000000 --- a/.github/workflows/dependabot-auto-merge.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Dependabot auto merge -on: pull_request_target -permissions: - pull-requests: write - contents: write -jobs: - dependabot: - runs-on: ubuntu-latest - if: ${{ github.repository == 'jhipster/jhipster-lite' && github.event.pull_request.user.login == 'dependabot[bot]' }} - steps: - - name: Dependabot metadata - id: dependabot-metadata - uses: dependabot/fetch-metadata@v1.3.0 - - name: Enable auto-merge for Dependabot PRs - if: ${{ steps.dependabot-metadata.outputs.update-type != 'version-update:semver-major' }} - run: gh pr merge --auto --merge "$PR_URL" - env: - PR_URL: ${{ github.event.pull_request.html_url }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index 402186696db..c3e84b7e575 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -219,3 +219,24 @@ jobs: files: lcov.info fail_ci_if_error: true verbose: true + #-------------------------------------------------- + # Dependabot auto merge PR + #-------------------------------------------------- + dependabot-auto-merge-pr: + name: dependabot-auto-merge-pr + needs: [cypress, generation] + permissions: + pull-requests: write + contents: write + runs-on: ubuntu-latest + if: ${{ github.repository == 'jhipster/jhipster-lite' && github.event.pull_request.user.login == 'dependabot[bot]' }} + steps: + - name: Dependabot metadata + id: dependabot-metadata + uses: dependabot/fetch-metadata@v1.3.0 + - name: Enable auto-merge for Dependabot PRs + if: ${{ steps.dependabot-metadata.outputs.update-type != 'version-update:semver-major' }} + run: gh pr merge --auto --merge "$PR_URL" + env: + PR_URL: ${{ github.event.pull_request.html_url }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 01041ea173f4eb6286b7cb757c24e2b971928373 Mon Sep 17 00:00:00 2001 From: Chintan Radia Date: Sat, 19 Mar 2022 12:51:03 +0530 Subject: [PATCH 2/2] Fixes #1081 skip auto run pr merge in main branch --- .github/workflows/github-actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index c3e84b7e575..84f7616444c 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -229,7 +229,7 @@ jobs: pull-requests: write contents: write runs-on: ubuntu-latest - if: ${{ github.repository == 'jhipster/jhipster-lite' && github.event.pull_request.user.login == 'dependabot[bot]' }} + if: ${{ github.repository == 'jhipster/jhipster-lite' && github.ref != 'refs/heads/main' && github.event.pull_request.user.login == 'dependabot[bot]' }} steps: - name: Dependabot metadata id: dependabot-metadata