From 289cd46cc7b2449bccac4c3ecb7f1bdf8912d904 Mon Sep 17 00:00:00 2001 From: Michael Lehmann Date: Tue, 4 Feb 2025 11:35:23 -0800 Subject: [PATCH 1/5] Fix automerge action syntax --- .github/workflows/automerge-approved-prs.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/automerge-approved-prs.yml b/.github/workflows/automerge-approved-prs.yml index 3cc02fd36..fc9445d7e 100644 --- a/.github/workflows/automerge-approved-prs.yml +++ b/.github/workflows/automerge-approved-prs.yml @@ -9,10 +9,7 @@ jobs: contents: write pull-requests: write id-token: write - if: >- - github.event.review.state == 'approved' && - github.event.repository == 'aws/configure-aws-credentials' && - (github.event.review.author_association == 'OWNER' || github.event.review.user.login == 'aws-sdk-osds') + if: ${{ github.event.review.state == 'approved' && github.repository == 'aws/configure-aws-credentials' && (github.event.review.author_association == 'OWNER' || github.event.review.author_association == 'MEMBER' || github.event.review.user.login == 'aws-sdk-osds') }} runs-on: ubuntu-latest steps: - name: Configure AWS credentials From 0e354bdccf3bb7fff0b823d9c5ae157cdf56a518 Mon Sep 17 00:00:00 2001 From: Michael Lehmann Date: Tue, 4 Feb 2025 13:55:31 -0800 Subject: [PATCH 2/5] Fix typo --- .github/workflows/automerge-approved-prs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automerge-approved-prs.yml b/.github/workflows/automerge-approved-prs.yml index fc9445d7e..d0d6adeab 100644 --- a/.github/workflows/automerge-approved-prs.yml +++ b/.github/workflows/automerge-approved-prs.yml @@ -9,7 +9,7 @@ jobs: contents: write pull-requests: write id-token: write - if: ${{ github.event.review.state == 'approved' && github.repository == 'aws/configure-aws-credentials' && (github.event.review.author_association == 'OWNER' || github.event.review.author_association == 'MEMBER' || github.event.review.user.login == 'aws-sdk-osds') }} + if: ${{ github.event.review.state == 'approved' && github.repository == 'aws-actions/configure-aws-credentials' && (github.event.review.author_association == 'OWNER' || github.event.review.author_association == 'MEMBER' || github.event.review.user.login == 'aws-sdk-osds') }} runs-on: ubuntu-latest steps: - name: Configure AWS credentials From b24f636a4f17ea13fd5e3b99c05fb917cb36b60c Mon Sep 17 00:00:00 2001 From: Michael Lehmann Date: Tue, 4 Feb 2025 16:18:08 -0800 Subject: [PATCH 3/5] Fix typo --- .github/workflows/dependabot-autoapprove.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependabot-autoapprove.yml b/.github/workflows/dependabot-autoapprove.yml index e205cd232..4d9dd0005 100644 --- a/.github/workflows/dependabot-autoapprove.yml +++ b/.github/workflows/dependabot-autoapprove.yml @@ -5,7 +5,7 @@ permissions: jobs: dependabot: runs-on: ubuntu-latest - if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'aws/configure-aws-credentials' + if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'aws-actions/configure-aws-credentials' steps: - name: Get Metadata id: dependabot-metadata From e835acb77c65fa6e8b1700a12abfc9b1acb8393f Mon Sep 17 00:00:00 2001 From: Michael Lehmann Date: Tue, 4 Feb 2025 16:21:40 -0800 Subject: [PATCH 4/5] Add brackets --- .github/workflows/dependabot-autoapprove.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependabot-autoapprove.yml b/.github/workflows/dependabot-autoapprove.yml index 4d9dd0005..5bf3c8d16 100644 --- a/.github/workflows/dependabot-autoapprove.yml +++ b/.github/workflows/dependabot-autoapprove.yml @@ -5,7 +5,7 @@ permissions: jobs: dependabot: runs-on: ubuntu-latest - if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'aws-actions/configure-aws-credentials' + if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'aws-actions/configure-aws-credentials' }} steps: - name: Get Metadata id: dependabot-metadata From 19e80a75e170cdfef915f1cfb53dd5fb5f565183 Mon Sep 17 00:00:00 2001 From: Michael Lehmann Date: Tue, 4 Feb 2025 16:24:58 -0800 Subject: [PATCH 5/5] add ID token permission --- .github/workflows/dependabot-autoapprove.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dependabot-autoapprove.yml b/.github/workflows/dependabot-autoapprove.yml index 5bf3c8d16..6ac964701 100644 --- a/.github/workflows/dependabot-autoapprove.yml +++ b/.github/workflows/dependabot-autoapprove.yml @@ -2,6 +2,7 @@ name: Dependabot auto-approve on: pull_request permissions: pull-requests: write + id-token: write jobs: dependabot: runs-on: ubuntu-latest