From ea29d002af47dcd9b10aa8a778be4c5aab3207ae Mon Sep 17 00:00:00 2001 From: Hans Kristian Flaatten Date: Mon, 4 Dec 2023 09:55:18 +0100 Subject: [PATCH 1/3] Update dependabot-auto-merge.yaml --- .github/workflows/dependabot-auto-merge.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dependabot-auto-merge.yaml b/.github/workflows/dependabot-auto-merge.yaml index 9549f78d..8215fbed 100644 --- a/.github/workflows/dependabot-auto-merge.yaml +++ b/.github/workflows/dependabot-auto-merge.yaml @@ -8,15 +8,15 @@ permissions: jobs: dependabot: runs-on: ubuntu-latest - if: ${{ github.actor == 'dependabot[bot]' }} + # if: ${{ github.actor == 'dependabot[bot]' }} steps: - name: Generate token - id: generate_token - uses: tibdex/github-app-token@v2.1.0 + id: app-token + uses: actions/create-github-app-token@v1 with: - app_id: "${{ secrets.DEPENDABOT_AUTO_MERGE_APP_ID}}" - private_key: "${{ secrets.DEPENDABOT_AUTO_MERGE_APP_SECRET }}" - + app-id: ${{ secrets.DEPENDABOT_AUTO_MERGE_APP_ID}} + private-key: ${{ secrets.DEPENDABOT_AUTO_MERGE_APP_SECRET }} + - name: Dependabot metadata id: metadata uses: dependabot/fetch-metadata@v1.6.0 @@ -24,7 +24,7 @@ jobs: github-token: "${{ secrets.GITHUB_TOKEN }}" - name: Authenticate cli - run: echo "${{ steps.generate_token.outputs.token }}" | gh auth login --with-token + run: echo "${{ steps.app-token.outputs.token }}" | gh auth login --with-token - name: Enable auto-merge for Dependabot PRs if: steps.metadata.outputs.update-type != 'version-update:semver-major' From ceef8642a0407ebfa6267538ff62b8ba0c4bb802 Mon Sep 17 00:00:00 2001 From: Hans Kristian Flaatten Date: Mon, 4 Dec 2023 10:15:00 +0100 Subject: [PATCH 2/3] Update dependabot-auto-merge.yaml --- .github/workflows/dependabot-auto-merge.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dependabot-auto-merge.yaml b/.github/workflows/dependabot-auto-merge.yaml index 8215fbed..559f8f26 100644 --- a/.github/workflows/dependabot-auto-merge.yaml +++ b/.github/workflows/dependabot-auto-merge.yaml @@ -16,6 +16,9 @@ jobs: with: app-id: ${{ secrets.DEPENDABOT_AUTO_MERGE_APP_ID}} private-key: ${{ secrets.DEPENDABOT_AUTO_MERGE_APP_SECRET }} + + - name: Authenticate cli + run: echo "${{ steps.app-token.outputs.token }}" | gh auth login --with-token - name: Dependabot metadata id: metadata @@ -23,9 +26,6 @@ jobs: with: github-token: "${{ secrets.GITHUB_TOKEN }}" - - name: Authenticate cli - run: echo "${{ steps.app-token.outputs.token }}" | gh auth login --with-token - - name: Enable auto-merge for Dependabot PRs if: steps.metadata.outputs.update-type != 'version-update:semver-major' run: gh pr merge --auto --squash "$PR_URL" From 2fdf027dbcc823ad55694831ef6956a2d495cdb0 Mon Sep 17 00:00:00 2001 From: Hans Kristian Flaatten Date: Mon, 4 Dec 2023 10:18:15 +0100 Subject: [PATCH 3/3] Update dependabot-auto-merge.yaml --- .github/workflows/dependabot-auto-merge.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dependabot-auto-merge.yaml b/.github/workflows/dependabot-auto-merge.yaml index 559f8f26..19cd46b5 100644 --- a/.github/workflows/dependabot-auto-merge.yaml +++ b/.github/workflows/dependabot-auto-merge.yaml @@ -19,15 +19,16 @@ jobs: - name: Authenticate cli run: echo "${{ steps.app-token.outputs.token }}" | gh auth login --with-token - + + - name: Enable auto-merge for Dependabot PRs + #if: steps.metadata.outputs.update-type != 'version-update:semver-major' + run: gh pr merge --auto --squash "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + - name: Dependabot metadata id: metadata uses: dependabot/fetch-metadata@v1.6.0 with: github-token: "${{ secrets.GITHUB_TOKEN }}" - - name: Enable auto-merge for Dependabot PRs - if: steps.metadata.outputs.update-type != 'version-update:semver-major' - run: gh pr merge --auto --squash "$PR_URL" - env: - PR_URL: ${{github.event.pull_request.html_url}}