From 41be7ea14cc0a83778c9a160474f8727b3485a40 Mon Sep 17 00:00:00 2001 From: Curtis Vogt Date: Fri, 24 Jan 2025 08:43:28 -0600 Subject: [PATCH] fixup! Compare more context --- .github/workflows/ReusableTest.yml | 11 ++++++++++- .github/workflows/ReusableWorkflow.yml | 7 +++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ReusableTest.yml b/.github/workflows/ReusableTest.yml index 4059d6d..fcada7b 100644 --- a/.github/workflows/ReusableTest.yml +++ b/.github/workflows/ReusableTest.yml @@ -23,10 +23,17 @@ jobs: jq -c <<<"$github_json" >github.json jq -c <<<"$env_json" >env.json jq -c <<<"$job_json" >job.json + 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) }} job_json: ${{ toJSON(job) }} + steps_json: ${{ toJSON(steps) }} + runner_json: ${{ toJSON(runner) }} + inputs_json: ${{ toJSON(inputs) }} - uses: actions/upload-artifact@v4 with: name: trigger-context @@ -64,6 +71,8 @@ jobs: echo "::endgroup::" echo "::group::Diff" - diff <(jq <<<"$a") <(jq <<<"$b") + (diff <(jq <<<"$a") <(jq <<<"$b")); same=$? echo "::endgroup::" + + [[ $same -eq 0 ]] && echo "Same" || echo "Differ" done diff --git a/.github/workflows/ReusableWorkflow.yml b/.github/workflows/ReusableWorkflow.yml index 0e9cfbc..16cb6bd 100644 --- a/.github/workflows/ReusableWorkflow.yml +++ b/.github/workflows/ReusableWorkflow.yml @@ -20,10 +20,17 @@ jobs: jq -c <<<"$github_json" >github.json jq -c <<<"$env_json" >env.json jq -c <<<"$job_json" >job.json + 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) }} job_json: ${{ toJSON(job) }} + steps_json: ${{ toJSON(steps) }} + runner_json: ${{ toJSON(runner) }} + inputs_json: ${{ toJSON(inputs) }} - uses: actions/upload-artifact@v4 with: name: reusable-context