Add workflow doing comparative testing of toolchain branches accross multiple targets

Blackhex · Blackhex · commit a05065cfc5c1 · 2025-01-15T18:03:18.000+01:00
diff --git a/.github/scripts/build.sh b/.github/scripts/build.sh
@@ -2,9 +2,9 @@
 
 source `dirname ${BASH_SOURCE[0]}`/config.sh
 
-#if [[ "$RUN_BOOTSTRAP" = 1 ]]; then
-#    $ROOT_PATH/.github/scripts/install-dependencies.sh
-#fi
+if [[ "$RUN_BOOTSTRAP" = 1 ]]; then
+    $ROOT_PATH/.github/scripts/install-dependencies.sh
+fi
 
 if [[ "$CCACHE" = 1 ]]; then
     source $ROOT_PATH/.github/scripts/enable-ccache.sh
diff --git a/.github/workflows/build-and-test-toolchain.yml b/.github/workflows/build-and-test-toolchain.yml
@@ -1,7 +1,6 @@
 name: Build and test main toolchain
 
 on:
-  pull_request:
   workflow_dispatch:
     inputs:
       binutils_branch:
@@ -60,6 +59,8 @@ on:
       gcc_test_filter:
         type: string
 
+run-name: Build and test ${{ inputs.arch }}-${{ inputs.platform }}-${{ inputs.crt }} toolchain
+
 env:
   BINUTILS_BRANCH: ${{ inputs.binutils_branch || 'woarm64' }}
   GCC_BRANCH: ${{ inputs.gcc_branch || 'woarm64' }}
@@ -73,6 +74,12 @@ env:
   MODULE: ${{ inputs.gcc_module || '' }}
   FILTER: ${{ inputs.gcc_test_filter || '' }}
 
+  DEFAULT_WINDOWS_RUNNER: ${{ (inputs.arch == 'x86_64' && inputs.platform != 'pc-linux-gnu') && 1 || 0 }}
+  DEFAULT_UBUNTU_RUNNER: ${{ (inputs.arch == 'x86_64' && inputs.platform == 'pc-linux-gnu') && 1 || 0 }}
+  SELF_HOSTED_RUNNER: ${{ (inputs.arch != 'x86_64') && 1 || 0 }}
+  WSL_RUNNER: ${{ ( inputs.platform == 'w64-mingw32') && 1 || 0 }}
+  WLS_DISTRO: Ubuntu-22.04
+
   TOOLCHAIN_PATH: ~/work/install
 
   CCACHE: 1
@@ -83,36 +90,63 @@ env:
 jobs:
   build-and-test-toolchain:
     name: Build and test toolchain
-    runs-on: [Windows, ARM64, WSL]
+    runs-on: ${{ (inputs.arch == 'x86_64') && ((inputs.platform == 'pc-linux-gnu') && 'ubuntu-latest' || 'windows-latest') || fromJson('["Windows", "ARM64", "WSL"]') }}
 
     env:
       WSLENV: BINUTILS_BRANCH:GCC_BRANCH:MINGW_BRANCH:ARCH:PLATFORM:CRT:TAG:MODULE:FILTER:CCACHE:RUN_BOOTSTRAP:UPDATE_SOURCES:GITHUB_OUTPUT/p:GITHUB_STEP_SUMMARY/p
 
     steps:
-      - name: Get cache key
-        id: get-cache-key
-        shell: powershell
+      - name: Env
         run: |
-          Write-Output "timestamp=$((Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ"))" >> "$env:GITHUB_OUTPUT"
+          echo DEFAULT_WINDOWS_RUNNER: ${{ env.DEFAULT_WINDOWS_RUNNER }}
+          echo DEFAULT_UBUNTU_RUNNER: ${{ env.DEFAULT_UBUNTU_RUNNER }}
+          echo SELF_HOSTED_RUNNER: ${{ env.SELF_HOSTED_RUNNER }}
+          echo WSL_RUNNER: ${{ env.WSL_RUNNER }}
+          echo WLS_DISTRO: ${{ env.WLS_DISTRO }}
+
+      - name: Install WSL (Vampire/setup-wsl)
+        if: ${{ (env.WSL_RUNNER == 1) && (env.DEFAULT_WINDOWS_RUNNER == 1) }}
+        uses: Windows-on-ARM-Experiments/setup-wsl@master
+        with:
+          distribution: ${{ env.WLS_DISTRO }}
+          additional-packages:
+            git
+
+      - name: Install winget
+        if: false
+        uses: Cyberboss/install-winget@v1
 
-      - name: Install WSL
+      - name: Install WSL (Ubuntu/WSL/.github/actions/wsl-install)
         if: false
+        uses: Ubuntu/WSL/.github/actions/wsl-install@main
+        with:
+          distro: ${{ env.WLS_DISTRO }}
+
+      - name: Install WSL (wsl --install)
+        if:  ${{ (env.WSL_RUNNER == 1) && (env.SELF_HOSTED_RUNNER == 1) }}
         run: |
-          wsl --install --enable-wsl1 --no-launch --distribution Ubuntu-22.04
+          wsl --set-default-version 1
+          wsl --install --no-launch --distribution ${{ env.WLS_DISTRO }}
 
       - name: Clean up previous build
+        if: ${{ (env.WSL_RUNNER == 1) && (env.SELF_HOSTED_RUNNER == 1) }}
         run: |
-          wsl whoami
-          wsl rm -rf ~/work
+          ${{ env.WSL_RUNNER && 'wsl ' || '' }} rm -rf ~/work
 
       - name: Checkout repository
         run: |
-          wsl git clone --depth=1 ${{ github.server_url }}/${{ github.repository }}.git -b ${{ github.head_ref || github.ref_name || 'main' }} ~/work
+          ls -al ~/work
+          ${{ (env.WSL_RUNNER == 1) && 'wsl ' || '' }} git clone --depth=1 ${{ github.server_url }}/${{ github.repository }}.git -b ${{ github.head_ref || github.ref_name || 'main' }} ~/work
 
       - name: Get WSL paths
         id: get-wsl-paths
         run: |
-          wsl ~/work/.github/scripts/setup-wsl.sh
+          ${{ (env.WSL_RUNNER == 1) && 'wsl ' || '' }} ~/work/.github/scripts/setup-wsl.sh
+
+      - name: Get cache key
+        id: get-cache-key
+        run: |
+          ${{ (env.WSL_RUNNER == 1) && 'wsl ' || '' }} echo "timestamp=$(date -u --iso-8601=seconds)" >> "$GITHUB_OUTPUT"
 
       - name: Restore Ccache
         uses: actions/cache/restore@v4
@@ -123,7 +157,7 @@ jobs:
 
       - name: Build toolchain
         run: |
-          wsl ~/work/.github/scripts/build.sh
+          ${{ (env.WSL_RUNNER == 1) && 'wsl ' || '' }} ~/work/.github/scripts/build.sh
 
       - name: Save Ccache
         if: always()
@@ -134,7 +168,7 @@ jobs:
 
       - name: Execute GCC tests
         run: |
-          wsl ~/work/.github/scripts/toolchain/execute-gcc-tests.sh "gcc-tests-${{ env.TAG }}" "${{ env.MODULE }}" "${{ env.FILTER }}"
+          ${{ (env.WSL_RUNNER == 1) && 'wsl ' || '' }} ~/work/.github/scripts/toolchain/execute-gcc-tests.sh "gcc-tests-${{ env.TAG }}" "${{ env.MODULE }}" "${{ env.FILTER }}"
 
       - name: Upload build folder
         if: failure()
diff --git a/.github/workflows/test-toolschains.yml b/.github/workflows/test-toolschains.yml
@@ -0,0 +1,73 @@
+name: Comparative test of toolchain branches accross multiple targets
+
+on:
+  pull_request:
+  workflow_dispatch:
+    inputs:
+      binutils_branch_baseline:
+        description: 'Baseline Binutils branch'
+        required: false
+        default: 'upstream'
+      binutils_branch_changes:
+        description: 'Changes Binutils branch'
+        required: false
+        default: 'upstream'
+      gcc_branch_baseline:
+        description: 'Baseline GCC branch'
+        required: false
+        default: 'upstream'
+      gcc_branch_changes:
+        description: 'Changes GCC branch'
+        required: false
+        default: 'upstream'
+      mingw_branch_baseline:
+        description: 'Baseline MinGW branch'
+        required: false
+        default: 'upstream'
+      mingw_branch_changes:
+        description: 'Changes MinGW branch'
+        required: false
+        default: 'upstream'
+  workflow_call:
+    inputs:
+      binutils_branch_baseline:
+        type: string
+      binutils_branch_changes:
+        type: string
+      gcc_branch_baseline:
+        type: string
+      gcc_branch_changes:
+        type: string
+      mingw_branch_baseline:
+        type: string
+      mingw_branch_changes:
+        type: string
+
+jobs:
+
+  build-and-test-toolchains:
+    name: Build and test toolchains
+
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [aarch64, x86_64]
+        platform: [w64-mingw32, pc-linux-gnu]
+        crt: [ucrt, libc]
+        exclude:
+          - platform: w64-mingw32
+            crt: libc
+          - platform: pc-linux-gnu
+            crt: ucrt
+
+    uses: ./.github/workflows/test-toolchain.yml
+    with:
+      binutils_branch_baseline: ${{ inputs.binutils_branch_baseline }}
+      binutils_branch_changes: ${{ inputs.binutils_branch_changes }}
+      gcc_branch_baseline: ${{ inputs.gcc_branch_baseline }}
+      gcc_branch_changes: ${{ inputs.gcc_branch_changes }}
+      mingw_branch_baseline: ${{ inputs.mingw_branch_baseline }}
+      mingw_branch_changes: ${{ inputs.mingw_branch_changes }}
+      arch: ${{ matrix.arch }}
+      platform: ${{ matrix.platform }}
+      crt: ${{ matrix.crt }}
