From 66c42b2f5f4b4a67bd0b68416a66df0a486c4d16 Mon Sep 17 00:00:00 2001
From: Oliver Gould <ver@buoyant.io>
Date: Tue, 12 Mar 2024 00:46:58 +0000
Subject: [PATCH] ci: Improve PR debugging

---
 .github/workflows/pr.yml | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 36a045f93f..d57c2d0dcd 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -40,13 +40,30 @@ jobs:
             **/*.rs
             Cargo.lock
     outputs:
-      is_dependabot: ${{ github.actor == 'dependabot[bot]' && 'true' || '' }}
-      any_changed: ${{ steps.build.outputs.any_changed || steps.cargo.outputs.any_changed || steps.rust.outputs.any_changed }}
+      is_dependabot: ${{ github.actor == 'dependabot[bot]' }}
+      any_changed: ${{ steps.build.outputs.any_changed == 'true' || steps.cargo.outputs.any_change == 'true' || steps.rust.outputs.any_changed == 'true' }}
       build_changed: ${{ steps.build.outputs.any_changed }}
       cargo_changed: ${{ steps.cargo.outputs.any_changed }}
       cargo_crates: ${{ steps.cargo-crates.outputs.crates }}
       rust_changed: ${{ steps.rust.outputs.any_changed }}
 
+  info:
+    timeout-minutes: 3
+    needs: meta
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      - name: Info
+        run: |
+          echo 'github.actor: ${{ github.actor }}'
+          echo 'github.event_name: ${{ github.event_name }}'
+          echo 'github.event.pull_request.number: ${{ github.event.pull_request.number }}'
+          echo 'needs.meta.outputs.is_dependabot: ${{ needs.meta.outputs.is_dependabot }}'
+          echo 'needs.meta.outputs.any_changed: ${{ needs.meta.outputs.any_changed }}'
+          echo 'needs.meta.outputs.cargo_changed: ${{ needs.meta.outputs.cargo_changed }}'
+          echo 'needs.meta.outputs.cargo_crates: ${{ needs.meta.outputs.cargo_crates }}'
+          echo 'needs.meta.outputs.rust_changed: ${{ needs.meta.outputs.rust_changed }}'
+
   rust:
     needs: meta
     if: needs.meta.outputs.any_changed == 'true'
@@ -110,23 +127,15 @@ jobs:
 
   ok:
     timeout-minutes: 3
-    needs: [meta, rust, rust-crates, linkerd-install]
+    needs: [rust, rust-crates, linkerd-install]
     if: always()
     runs-on: ubuntu-latest
     steps:
-      - name: Info
+      - name: Results
         run: |
-          echo 'github.actor: ${{ github.actor }}'
-          echo 'github.event_name: ${{ github.event_name }}'
-          echo 'github.event.pull_request.number: ${{ github.event.pull_request.number }}'
           echo 'needs.rust.result: ${{ needs.rust.result }}'
           echo 'needs.rust-crates.result: ${{ needs.rust-crates.result }}'
           echo 'needs.linkerd-install.result: ${{ needs.linkerd-install.result }}'
-          echo 'needs.meta.outputs.is_dependabot: ${{ needs.meta.outputs.is_dependabot }}'
-          echo 'needs.meta.outputs.any_changed: ${{ needs.meta.outputs.any_changed }}'
-          echo 'needs.meta.outputs.cargo_changed: ${{ needs.meta.outputs.cargo_changed }}'
-          echo 'needs.meta.outputs.cargo_crates: ${{ needs.meta.outputs.cargo_crates }}'
-          echo 'needs.meta.outputs.rust_changed: ${{ needs.meta.outputs.rust_changed }}'
       - if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
         run: exit 1