ci: Restructure toolchain build process

This commit restructures the CI toolchain and distribution bundle build
process in preparation for adding Clang/LLVM toolchain build process.

The changes introduced in this commit are as follows:

* Prefix all existing GNU toolchain build steps with `gnu`.
* Relocate GNU toolchain directories to `gnu/` in the distribution
  bundle.
* Rename "full distribution bundle" to "GNU distribution bundle" with
  `_gnu` suffix in the archive name.
* Rename `sdk_toolchains` file, which contains the list of all available
  GNU toolchains to `sdk_gnu_toolchains`.
* Relocate host tools root directory to `hosttools/` in the distribution
  bundle.

Signed-off-by: Stephanos Ioannidis <[email protected]>

Author: stephanosio

.github/workflows/ci.yml

@@ -419,9 +419,9 @@ jobs:
         CONFIG_REPORT_CONTENT="${CONFIG_REPORT_CONTENT//$'\r'/'%0D'}"
         echo "::notice:: ${CONFIG_REPORT_CONTENT}"
 
-  # Build toolchain
-  build-toolchain:
-    name: Toolchain ${{ matrix.target }} (${{ matrix.host.name }})
+  # Build GNU toolchain
+  build-gnu-toolchain:
+    name: GNU Toolchain ${{ matrix.target }} (${{ matrix.host.name }})
     needs: setup
     runs-on:
       group: ${{ matrix.host.runner }}
@@ -780,7 +780,7 @@ jobs:
         fi
 
         # Create archive
-        ARCHIVE_NAME=toolchain_${{ matrix.host.name }}_${{ matrix.target }}
+        ARCHIVE_NAME=toolchain_gnu_${{ matrix.host.name }}_${{ matrix.target }}
         ARCHIVE_FILE=${ARCHIVE_NAME}.${{ matrix.host.archive }}
 
         if [ "${{ matrix.host.archive }}" == "tar.xz" ]; then
@@ -820,15 +820,15 @@ jobs:
       if: always()
       uses: actions/upload-artifact@v4
       with:
-        name: log_${{ matrix.host.name }}_${{ matrix.target }}
+        name: log_toolchain_gnu_${{ matrix.host.name }}_${{ matrix.target }}
         path: ${{ matrix.target }}.log
 
     - name: Upload toolchain build artifact
       uses: actions/upload-artifact@v4
       with:
-        name: toolchain_${{ matrix.host.name }}_${{ matrix.target }}
+        name: toolchain_gnu_${{ matrix.host.name }}_${{ matrix.target }}
         path: |
-          toolchain_${{ matrix.host.name }}_${{ matrix.target }}.${{ matrix.host.archive }}
+          toolchain_gnu_${{ matrix.host.name }}_${{ matrix.target }}.${{ matrix.host.archive }}
           md5.sum
           sha256.sum
 
@@ -1074,7 +1074,7 @@ jobs:
   # Build distribution bundle
   build-dist-bundle:
     name: Distribution Bundle (${{ matrix.host.name }})
-    needs: [ setup, build-toolchain, build-hosttools, build-cmake-pkg ]
+    needs: [ setup, build-gnu-toolchain, build-hosttools, build-cmake-pkg ]
     runs-on:
       group: ${{ matrix.host.runner }}
     container: ${{ matrix.host.container }}
@@ -1170,8 +1170,8 @@ jobs:
         # Stage version file
         echo "${VERSION}" > sdk_version
 
-        # Stage toolchain list file
-        echo '${{ needs.setup.outputs.targets }}' | jq -cr '.[]' > sdk_toolchains
+        # Stage GNU toolchain list file
+        echo '${{ needs.setup.outputs.targets }}' | jq -cr '.[]' > sdk_gnu_toolchains
 
         # Stage CMake package
         ## Verify CMake package archive checksum
@@ -1192,8 +1192,13 @@ jobs:
           sha256sum --check sha256.sum
           popd
 
+          # Create host tools root directory
+          mkdir hosttools
+
           # Extract host tools archive
+          pushd hosttools
           ${EXTRACT} ${ARTIFACT_ROOT}/${HOSTTOOLS_ARTIFACT}/${HOSTTOOLS_ARTIFACT}.${EXT}
+          popd
         fi
 
         # Stage setup script
@@ -1217,15 +1222,16 @@ jobs:
           7z a -t7z -l ${ARCHIVE_NAME}_minimal.${EXT} ${ARCHIVE_DIR}
         fi
 
-        # Stage toolchains
-        pushd ${ARCHIVE_DIR}
+        # Stage GNU toolchains
+        mkdir ${ARCHIVE_DIR}/gnu
+        pushd ${ARCHIVE_DIR}/gnu
 
         ## Generate target list from the workflow matrix
         TARGETS=$(echo '${{ needs.setup.outputs.targets }}' | jq -cr '.[]')
 
         ## Extract all toolchains
         for TARGET in ${TARGETS}; do
-          TOOLCHAIN_ARTIFACT=toolchain_${HOST}_${TARGET}
+          TOOLCHAIN_ARTIFACT=toolchain_gnu_${HOST}_${TARGET}
 
           # Verify toolchain archive checksum
           pushd ${ARTIFACT_ROOT}/${TOOLCHAIN_ARTIFACT}
@@ -1238,25 +1244,25 @@ jobs:
         done
         popd
 
-        # Create full distribution bundle archive
+        # Create GNU distribution bundle archive
         if [ "${{ matrix.host.archive }}" == "tar.xz" ]; then
           XZ_OPT="-T0" \
-          ${TAR} -Jcvf ${ARCHIVE_NAME}.${EXT} --owner=0 --group=0 \
+          ${TAR} -Jcvf ${ARCHIVE_NAME}_gnu.${EXT} --owner=0 --group=0 \
                  -C . ${ARCHIVE_DIR}
         elif [ "${{ matrix.host.archive }}" == "7z" ]; then
-          7z a -t7z -l ${ARCHIVE_NAME}.${EXT} ${ARCHIVE_DIR}
+          7z a -t7z -l ${ARCHIVE_NAME}_gnu.${EXT} ${ARCHIVE_DIR}
         fi
 
         # Compute checksum
-        md5sum ${ARCHIVE_NAME}.${EXT} ${ARCHIVE_NAME}_minimal.${EXT} > md5.sum
-        sha256sum ${ARCHIVE_NAME}.${EXT} ${ARCHIVE_NAME}_minimal.${EXT} > sha256.sum
+        md5sum ${ARCHIVE_NAME}_gnu.${EXT} ${ARCHIVE_NAME}_minimal.${EXT} > md5.sum
+        sha256sum ${ARCHIVE_NAME}_gnu.${EXT} ${ARCHIVE_NAME}_minimal.${EXT} > sha256.sum
 
     - name: Upload distribution bundle
       uses: actions/upload-artifact@v4
       with:
         name: ${{ env.BUNDLE_ARCHIVE_NAME }}
         path: |
-          ${{ env.BUNDLE_ARCHIVE_NAME }}.${{ matrix.host.archive }}
+          ${{ env.BUNDLE_ARCHIVE_NAME }}_gnu.${{ matrix.host.archive }}
           ${{ env.BUNDLE_ARCHIVE_NAME }}_minimal.${{ matrix.host.archive }}
           md5.sum
           sha256.sum
@@ -1405,8 +1411,8 @@ jobs:
         sha256sum --check sha256.sum
         popd
 
-        # Extract distribution bundle archive
-        BUNDLE_FILE=${BUNDLE_NAME}.${{ matrix.testenv.bundle-archive }}
+        # Extract GNU distribution bundle archive
+        BUNDLE_FILE=${BUNDLE_NAME}_gnu.${{ matrix.testenv.bundle-archive }}
         if [ "${{ matrix.testenv.bundle-archive }}" == "tar.xz" ]; then
           ${TAR} -Jxvf ${ARTIFACT_ROOT}/${BUNDLE_FILE} -C tools
         elif [ "${{ matrix.testenv.bundle-archive }}" == "7z" ]; then