Tidy up and add some more test OSes

Author: will-v-pi

.github/workflows/build.yml

@@ -12,17 +12,11 @@ env:
 jobs:
   build_windows:
     name: Build Windows
-    # runs-on: [self-hosted, Windows, x64]
     runs-on: 'windows-latest'
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      # - name: Setup SSH Auth
-      #   if: runner.environment == 'github-hosted'
-      #   uses: webfactory/[email protected]
-      #   with:
-      #     ssh-private-key: ${{ secrets.SSH_KEY }}
       - name: Setup MSYS2
         uses: msys2/setup-msys2@v2
       - name: Build
@@ -51,32 +45,27 @@ jobs:
 
   build_macos:
     name: Build MacOS
-    # runs-on: [self-hosted, macOS]
     runs-on: 'macos-14'
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Set up arm64 Homebrew
-        if: runner.environment == 'github-hosted'
         id: set-up-homebrew
         uses: Homebrew/actions/setup-homebrew@master
-      - name: Build
+      - name: Build arm64
         run: ./build_macos.sh
       - name: Uninstall arm64 Homebrew
-        if: runner.environment == 'github-hosted'
         run: |
           NONINTERACTIVE=1 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/uninstall.sh)"
           rm -rf /opt/homebrew || true
       - name: Set up x86_64 Homebrew
-        if: runner.environment == 'github-hosted'
         run: |
           NONINTERACTIVE=1 arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
       - name: Install x86_64 pkg-config & cmake
-        if: runner.environment == 'github-hosted'
         run: |
           arch -x86_64 /usr/local/bin/brew install pkg-config cmake
-      - name: Build
+      - name: Build x86_64
         run: arch -x86_64 ./build_macos.sh
       - name: Merge Universal Binaries
         run: ./merge_macos.sh
@@ -101,22 +90,15 @@ jobs:
 
   build_linux:
     name: Build Linux
-    # strategy:
-    #   matrix:
-    #     os: [[self-hosted, linux, x64], [self-hosted, linux, arm64]]
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-22.04, [self-hosted, linux, arm64, bookworm, 8G]]
     runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      # - name: Setup SSH Auth
-      #   if: runner.environment == 'github-hosted'
-      #   uses: webfactory/[email protected]
-      #   with:
-      #     ssh-private-key: ${{ secrets.SSH_KEY }}
       - name: Build
         run: ./build_linux.sh
       - name: Upload Artifact
@@ -141,30 +123,33 @@ jobs:
   test_binaries:
     name: Test Binaries
     needs: [build_linux, build_macos, build_windows]
+    if: always() && contains(needs.*.result, 'success')
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, macos-13, windows-latest, [self-hosted, linux, arm64, bookworm_desktop], [self-hosted, linux, arm64, trixie_desktop]]
+        # Test all GitHub supported versions, except for windows-11-arm
+        os: [macos-15, macos-15-intel, macos-14, windows-2025, windows-2022, windows-11-arm, ubuntu-24.04, ubuntu-22.04, ubuntu-24.04-arm, ubuntu-22.04-arm, [self-hosted, linux, arm64, trixie_desktop], [self-hosted, linux, arm64, bookworm_desktop]]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Download build (Windows)
-        if: ${{ runner.os == 'Windows' }}
+        if: runner.os == 'Windows'
         uses: actions/download-artifact@v5
         with:
-          name: tools-win-${{ runner.arch }}
+          # Only built for x64, but arm should still run it fine
+          name: tools-win-X64
       - name: Download build (MacOS)
-        if: ${{ runner.os == 'macOS' }}
+        if: runner.os == 'macOS'
         uses: actions/download-artifact@v5
         with:
           name: tools-mac-universal
       - name: Download build (Linux)
-        if: ${{ runner.os == 'Linux' }}
+        if: runner.os == 'Linux'
         uses: actions/download-artifact@v5
         with:
           name: tools-lin-${{ runner.arch }}
 
       - name: Extract build (zip)
-        if: ${{ runner.os == 'Windows' || runner.os == 'macOS' }}
+        if: runner.os == 'Windows' || runner.os == 'macOS'
         shell: bash # Windows only has unzip in bash shell
         run: |
           unzip -o pico-sdk-tools*.zip
@@ -176,7 +161,7 @@ jobs:
           unzip -o riscv-toolchain*.zip || true
           ls
       - name: Extract build (tar.gz)
-        if: ${{ runner.os == 'Linux' }}
+        if: runner.os == 'Linux'
         run: |
           tar -xvf pico-sdk-tools*.tar.gz
           ls
@@ -187,16 +172,21 @@ jobs:
           tar -xvf riscv-toolchain*.tar.gz || true
           ls
 
+      - name: Clean runner (MacOS)
+        if: runner.os == 'macOS'
+        run: |
+          NONINTERACTIVE=1 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/uninstall.sh)"
+
       - name: Test default stuff runs
         run: |
           ./picotool/picotool version
           ./pioasm/pioasm --version
       - name: Test openocd runs
-        if: ${{ env.SKIP_OPENOCD != 1 }}
+        if: env.SKIP_OPENOCD != 1
         run: |
           ./openocd --version
       - name: Test riscv-toolchain runs
-        if: ${{ env.SKIP_RISCV != 1 }}
+        if: env.SKIP_RISCV != 1
         run: |
           ./bin/riscv32-unknown-elf-gcc --version
           ./bin/riscv32-unknown-elf-gdb --version