From 18b93e9457957ae3bba7effc962c1bd5b3317f24 Mon Sep 17 00:00:00 2001 From: michel Date: Fri, 3 May 2024 20:08:28 +0200 Subject: [PATCH 1/2] fixes the usage of env vars and simplified URL --- .github/workflows/add-release-reviewers.yml | 38 ++++++++++++--------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/.github/workflows/add-release-reviewers.yml b/.github/workflows/add-release-reviewers.yml index d46329d994f9d..acd93210971ff 100644 --- a/.github/workflows/add-release-reviewers.yml +++ b/.github/workflows/add-release-reviewers.yml @@ -9,29 +9,35 @@ permissions: {} jobs: add-reviewers: - if: ${{ github.event.label.name == 'release' }} # Tests that label is added on the PR + if: ${{ github.event.label.name == 'release' }} runs-on: ubuntu-latest + env: + ORG: ${{ github.event.organization }} + # we can use the team slug when making this a reusable workflow + TEAM_SLUG: x + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} permissions: contents: read + pull-requests: write steps: - id: get-members - uses: garnertb/get-team-members@0482f68c88601800f85145570ea93bf8fcfcf46f - with: - org: mui - team_slug: x - role: maintainer - token: ${{ secrets.GITHUB_TOKEN }} + run: | + DATA=$(gh api \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + /orgs/$ORG/teams/$TEAM_SLUG/members \ + | jq 'reduce inputs as $i (.; . += $i)') \ + echo "data=$DATA" >> $GITHUB_OUTPUT \ + echo "members=${{ join(fromJson($DATA).*.login) }}" >> $GITHUB_OUTPUT \ # assign reviewers - - name: Add reviewer + - id: assign-reviewers run: | curl -L \ - -X POST \ - -H "Accept: application/vnd.github+json" \ - -H "Authorization: Bearer " \ - -H "X-GitHub-Api-Version: 2022-11-28" \ - /repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/requested_reviewers \ - -d '{"reviewers":[${{ steps.get-members.outputs.members }}]}' \ - env: - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} + -X POST \ + -H "Accept: application/vnd.github+json" \ + -H "Authorization: Bearer $GITHUB_TOKEN" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + https://api.github.com/repos/$ORG/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/requested_reviewers \ + -d '{"reviewers":[${{ steps.get-members.outputs.members }}]}' \ From 8ab28254ae1a5c5af9d1fce19166221381d7169c Mon Sep 17 00:00:00 2001 From: michel Date: Sat, 4 May 2024 07:24:48 +0200 Subject: [PATCH 2/2] review remarks --- .github/workflows/add-release-reviewers.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/add-release-reviewers.yml b/.github/workflows/add-release-reviewers.yml index acd93210971ff..d7b5e509e7938 100644 --- a/.github/workflows/add-release-reviewers.yml +++ b/.github/workflows/add-release-reviewers.yml @@ -28,8 +28,8 @@ jobs: -H "X-GitHub-Api-Version: 2022-11-28" \ /orgs/$ORG/teams/$TEAM_SLUG/members \ | jq 'reduce inputs as $i (.; . += $i)') \ - echo "data=$DATA" >> $GITHUB_OUTPUT \ - echo "members=${{ join(fromJson($DATA).*.login) }}" >> $GITHUB_OUTPUT \ + echo "data=$DATA" >> $GITHUB_OUTPUT + echo "members=${{ join(fromJson($DATA).*.login) }}" >> $GITHUB_OUTPUT # assign reviewers - id: assign-reviewers