From 0b4ef62eedd35f6e3efa0f575faba0df776e4d13 Mon Sep 17 00:00:00 2001
From: Roy Ivy III <rivy.dev@gmail.com>
Date: Wed, 18 Jan 2023 11:43:07 -0600
Subject: [PATCH] maint/CICD ~ refactor to standard use of `outputs()`

---
 .github/workflows/CICD.yml     | 4 +++-
 .github/workflows/GnuTests.yml | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml
index ae03ff457..c4ed13049 100644
--- a/.github/workflows/CICD.yml
+++ b/.github/workflows/CICD.yml
@@ -846,7 +846,9 @@ jobs:
       shell: bash
       run: |
         ## VARs setup
-        echo "TEST_SUMMARY_FILE=toybox-result.json" >> $GITHUB_OUTPUT
+        outputs() { step_id="vars"; for var in "$@" ; do echo steps.${step_id}.outputs.${var}="${!var}"; echo "${var}=${!var}" >> $GITHUB_OUTPUT; done; }
+        TEST_SUMMARY_FILE="toybox-result.json"
+        outputs TEST_SUMMARY_FILE
     - uses: actions/checkout@v3
     - uses: Swatinem/rust-cache@v2
     - name: rust toolchain ~ install
diff --git a/.github/workflows/GnuTests.yml b/.github/workflows/GnuTests.yml
index 1000792f3..123805644 100644
--- a/.github/workflows/GnuTests.yml
+++ b/.github/workflows/GnuTests.yml
@@ -23,7 +23,7 @@ jobs:
       shell: bash
       run: |
         ## VARs setup
-        outputs() { step_id="vars"; for var in "$@" ; do echo steps.${step_id}.outputs.${var}="${!var}"; echo "${var}=${!var}" >> $GITHUB_OUTPUT; done; }
+        outputs() { step_id="${{ github.action }}"; for var in "$@" ; do echo steps.${step_id}.outputs.${var}="${!var}"; echo "${var}=${!var}" >> $GITHUB_OUTPUT; done; }
         # * config
         path_GNU="gnu"
         path_GNU_tests="${path_GNU}/tests"
@@ -123,7 +123,7 @@ jobs:
       run: |
         path_UUTILS='${{ steps.vars.outputs.path_UUTILS }}'
         ## Extract/summarize testing info
-        outputs() { step_id="summary"; for var in "$@" ; do echo steps.${step_id}.outputs.${var}="${!var}"; echo "${var}=${!var}" >> $GITHUB_OUTPUT; done; }
+        outputs() { step_id="${{ github.action }}"; for var in "$@" ; do echo steps.${step_id}.outputs.${var}="${!var}"; echo "${var}=${!var}" >> $GITHUB_OUTPUT; done; }
         #
         SUITE_LOG_FILE='${{ steps.vars.outputs.SUITE_LOG_FILE }}'
         ROOT_SUITE_LOG_FILE='${{ steps.vars.outputs.ROOT_SUITE_LOG_FILE }}'