From 29679ba337c94e616a81c858d156296d613b41ef Mon Sep 17 00:00:00 2001
From: Roy Ivy III <rivy.dev@gmail.com>
Date: Fri, 11 Feb 2022 00:52:28 -0600
Subject: [PATCH] maint/CICD ~ (GnuTests) refactor GnuTests GHA config

- combine gnu/gnulib into single repository checkout
- code consolidation
- DRY changes
- variable consolidation and renaming
- job/step naming normalization
---
 .github/workflows/GnuTests.yml | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/GnuTests.yml b/.github/workflows/GnuTests.yml
index 738a80e84..bd72faf9d 100644
--- a/.github/workflows/GnuTests.yml
+++ b/.github/workflows/GnuTests.yml
@@ -17,11 +17,10 @@ jobs:
         outputs() { step_id="vars"; for var in "$@" ; do echo steps.${step_id}.outputs.${var}="${!var}"; echo ::set-output name=${var}::${!var}; done; }
         # * config
         path_GNU="gnu"
-        path_GNULIB="gnulib"
-        path_GNU_tests="gnu/tests"
+        path_GNU_tests="${path_GNU}/tests"
         path_UUTILS="uutils"
         path_reference="reference"
-        outputs path_GNU path_GNU_tests path_GNULIB path_reference path_UUTILS
+        outputs path_GNU path_GNU_tests path_reference path_UUTILS
         #
         repo_default_branch="${{ github.event.repository.default_branch }}"
         repo_GNU_ref="v9.0"
@@ -35,23 +34,17 @@ jobs:
         TEST_FILESET_SUFFIX='.txt'
         TEST_SUMMARY_FILE='gnu-result.json'
         outputs SUITE_LOG_FILE TEST_FILESET_PREFIX TEST_FILESET_SUFFIX TEST_LOGS_GLOB TEST_SUMMARY_FILE
-    - name: Checkout code uutil
+    - name: Checkout code (uutil)
       uses: actions/checkout@v2
       with:
         path: '${{ steps.vars.outputs.path_UUTILS }}'
-    - name: Checkout GNU coreutils
+    - name: Checkout code (GNU coreutils)
       uses: actions/checkout@v2
       with:
         repository: 'coreutils/coreutils'
         path: '${{ steps.vars.outputs.path_GNU }}'
         ref: ${{ steps.vars.outputs.repo_GNU_ref }}
-    - name: Checkout GNU coreutils library (gnulib)
-      uses: actions/checkout@v2
-      with:
-        repository: 'coreutils/gnulib'
-        path: '${{ steps.vars.outputs.path_GNULIB }}'
-        ref: ${{ steps.vars.outputs.repo_GNULIB_ref }}
-        fetch-depth: 0 # full depth checkout (o/w gnu gets upset if gnulib is a shallow checkout)
+        submodules: recursive
     - name: Retrieve reference artifacts
       uses: dawidd6/action-download-artifact@v2
       # ref: <https://github.com/dawidd6/action-download-artifact>
@@ -85,7 +78,6 @@ jobs:
       shell: bash
       run: |
         path_GNU='${{ steps.vars.outputs.path_GNU }}'
-        path_GNULIB='${{ steps.vars.outputs.path_GNULIB }}'
         path_UUTILS='${{ steps.vars.outputs.path_UUTILS }}'
         bash "${path_UUTILS}/util/run-gnu-test.sh"
     - name: Extract/summarize testing info