From 46044e72abe138a2764c0f417406dfaf63ccef7e Mon Sep 17 00:00:00 2001
From: Curtis Vogt <curtis.vogt@gmail.com>
Date: Fri, 24 Jan 2025 08:48:06 -0600
Subject: [PATCH] fixup! Compare more context

---
 .github/workflows/ReusableTest.yml     | 7 ++++---
 .github/workflows/ReusableWorkflow.yml | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ReusableTest.yml b/.github/workflows/ReusableTest.yml
index fcada7b..579941e 100644
--- a/.github/workflows/ReusableTest.yml
+++ b/.github/workflows/ReusableTest.yml
@@ -18,7 +18,6 @@ jobs:
       - name: Save cache
         uses: ./
       - name: Export Context
-        id: export
         run: |
           jq -c <<<"$github_json" >github.json
           jq -c <<<"$env_json" >env.json
@@ -26,7 +25,6 @@ jobs:
           jq -c <<<"$steps_json" >steps.json
           jq -c <<<"$runner_json" >runner.json
           jq -c <<<"$inputs_json" >inputs.json
-          jq -n env >env_vars.json
         env:
           github_json: ${{ toJSON(github) }}
           env_json: ${{ toJSON(env) }}
@@ -34,6 +32,8 @@ jobs:
           steps_json: ${{ toJSON(steps) }}
           runner_json: ${{ toJSON(runner) }}
           inputs_json: ${{ toJSON(inputs) }}
+      - name: Export environmental variables
+        run: jq -n env >env_vars.json
       - uses: actions/upload-artifact@v4
         with:
           name: trigger-context
@@ -71,7 +71,8 @@ jobs:
               echo "::endgroup::"
               
               echo "::group::Diff"
-              (diff <(jq <<<"$a") <(jq <<<"$b")); same=$?
+              same=0
+              diff <(jq <<<"$a") <(jq <<<"$b") || same=$?
               echo "::endgroup::"
 
               [[ $same -eq 0 ]] && echo "Same" || echo "Differ"
diff --git a/.github/workflows/ReusableWorkflow.yml b/.github/workflows/ReusableWorkflow.yml
index 16cb6bd..7cd4f57 100644
--- a/.github/workflows/ReusableWorkflow.yml
+++ b/.github/workflows/ReusableWorkflow.yml
@@ -15,7 +15,6 @@ jobs:
       - name: Save cache
         uses: ./
       - name: Export Context
-        id: export
         run: |
           jq -c <<<"$github_json" >github.json
           jq -c <<<"$env_json" >env.json
@@ -23,7 +22,6 @@ jobs:
           jq -c <<<"$steps_json" >steps.json
           jq -c <<<"$runner_json" >runner.json
           jq -c <<<"$inputs_json" >inputs.json
-          jq -n env >env_vars.json
         env:
           github_json: ${{ toJSON(github) }}
           env_json: ${{ toJSON(env) }}
@@ -31,6 +29,8 @@ jobs:
           steps_json: ${{ toJSON(steps) }}
           runner_json: ${{ toJSON(runner) }}
           inputs_json: ${{ toJSON(inputs) }}
+      - name: Export environmental variables
+        run: jq -n env >env_vars.json
       - uses: actions/upload-artifact@v4
         with:
           name: reusable-context