From 4aa70bbd23e61e04a9b339adf4f6ecae4bbf9cc5 Mon Sep 17 00:00:00 2001 From: Hans Kristian Flaatten Date: Mon, 4 Dec 2023 10:18:30 +0100 Subject: [PATCH] Update dependabot-auto-merge.yaml (#251) * Update dependabot-auto-merge.yaml * Update dependabot-auto-merge.yaml * Update dependabot-auto-merge.yaml --- .github/workflows/dependabot-auto-merge.yaml | 27 ++++++++++---------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/dependabot-auto-merge.yaml b/.github/workflows/dependabot-auto-merge.yaml index 9549f78d..19cd46b5 100644 --- a/.github/workflows/dependabot-auto-merge.yaml +++ b/.github/workflows/dependabot-auto-merge.yaml @@ -8,26 +8,27 @@ 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 }}" - - - name: Dependabot metadata - id: metadata - uses: dependabot/fetch-metadata@v1.6.0 - with: - github-token: "${{ secrets.GITHUB_TOKEN }}" + app-id: ${{ secrets.DEPENDABOT_AUTO_MERGE_APP_ID}} + private-key: ${{ secrets.DEPENDABOT_AUTO_MERGE_APP_SECRET }} - 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' + #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 }}" +