ci: more debugging (#14550)

googleapis · Jul 23, 2024 · ea3eb6e · ea3eb6e
1 parent af5b756
commit ea3eb6e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/test-runner-untrusted.yml b/.github/workflows/test-runner-untrusted.yml
@@ -28,7 +28,7 @@ jobs:
     # `ref` of the pull request, so downstream jobs know what to checkout.
     environment: 'external'
     name: Require Approval for External PRs
-    if: ${{ github.event.pull_request.author_association != 'MEMBER' }}
+    if: ${{ github.event.pull_request.author_association != 'MEMBER' && github.event.pull_request.author_association != 'COLLABORATOR' }}
     runs-on: ubuntu-latest
     outputs:
       checkout-sha: ${{ steps.save-pull-request.outputs.sha }}

diff --git a/.github/workflows/test-runner.yml b/.github/workflows/test-runner.yml
@@ -36,8 +36,12 @@ jobs:
     steps:
       - name: debug_steps
         id: debug-steps
-        run: >
-          echo "event=${{ github.event_name }}; assoc=${{ github.event.pull_request.author_association }}"
+        run: |
+          echo "event=${{ github.event_name }}"
+          echo "assoc=${{ github.event.pull_request.author_association }}"
+          echo "org=${{ github.organization }}" || true
+          echo "user=${{ github.event.pull_request.user }}" || true
+          echo "user_orgs=${{ github.event.pull_request.user.organizations_url }}" || true
 
   pre-flight:
     # Save the `ref` of the pull request, so downstream jobs know what to checkout.
@@ -50,7 +54,8 @@ jobs:
     needs: [debug]
     if: >-
       ${{
-          (github.event.pull_request.author_association == 'MEMBER' &&
+          ((github.event.pull_request.author_association == 'MEMBER' ||
+           github.event.pull_request.author_association == 'COLLABORATOR') &&
           github.event_name == 'pull_request_target') ||
           github.event_name == 'push' ||
           github.event_name == 'schedule'