From 8fff0031d41a99bb4c48e3f722768e362aa51eee Mon Sep 17 00:00:00 2001 From: Riley Date: Mon, 27 Jan 2025 12:37:40 -0700 Subject: [PATCH 1/2] updated message --- .github/workflows/pr.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index fe26f98e06..266b623195 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -19,13 +19,13 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Debug Permission Response run: | - echo "Permission raw response: ${{ steps.check_permissions.outputs.data }}" - - name: Validate Write Permission + echo "Permissions raw response: ${{ steps.check_permissions.outputs.data }}" + - name: Validate Write Permissions run: | permission=$(echo "${{ fromJson(steps.check_permissions.outputs.data).permission }}") echo "User ${{ github.actor }} has permissions: $permission" if [[ "$permission" != "write" && "$permission" != "admin" ]]; then - echo "User ${{ github.actor }} does not have sufficient permissions (write or admin) to proceed." + echo "User ${{ github.actor }} does not have sufficient permissions (write or admin) to proceed. Someone from the team needs to rerun this workflow AFTER it has been deemed safe." exit 1 fi - name: Checkout @@ -66,13 +66,13 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Debug Permission Response run: | - echo "Permission raw response: ${{ steps.check_permissions.outputs.data }}" - - name: Validate Write Permission + echo "Permissions raw response: ${{ steps.check_permissions.outputs.data }}" + - name: Validate Write Permissions run: | permission=$(echo "${{ fromJson(steps.check_permissions.outputs.data).permission }}") echo "User ${{ github.actor }} has permissions: $permission" if [[ "$permission" != "write" && "$permission" != "admin" ]]; then - echo "User ${{ github.actor }} does not have sufficient permissions (write or admin) to proceed." + echo "User ${{ github.actor }} does not have sufficient permissions (write or admin) to proceed. Someone from the team needs to rerun this workflow AFTER it has been deemed safe." exit 1 fi - name: Checkout From 6da8dcfcfced99728d9366fd958ec5a910b428b1 Mon Sep 17 00:00:00 2001 From: Riley Date: Mon, 27 Jan 2025 12:52:59 -0700 Subject: [PATCH 2/2] adding missing 's' --- .github/workflows/pr.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 266b623195..e9f848bad2 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -12,7 +12,7 @@ jobs: steps: - name: Check Write Permission uses: octokit/request-action@v2.x - id: check_permission + id: check_permissions with: route: GET /repos/${{ github.repository }}/collaborators/${{ github.actor }}/permission env: @@ -59,7 +59,7 @@ jobs: steps: - name: Check Write Permission uses: octokit/request-action@v2.x - id: check_permission + id: check_permissions with: route: GET /repos/${{ github.repository }}/collaborators/${{ github.actor }}/permission env: