ci: switch to matrix for latest/legacy builds

Author: ppannuto

.github/workflows/ci.yml

@@ -29,33 +29,46 @@ jobs:
       - name: ci-format
         run: pushd examples; ./format_all.sh || exit; popd
 
-  # Build on the newest-available OS with newest-available compilers
-  ci-build-latest:
+  ci-build:
+    # Build on the newest-available OS with newest-available compilers and with
+    # default compiler versions from the oldest current Ubuntu LTS
     strategy:
       matrix:
-        os: [ubuntu-latest]
-    # The type of runner that the job will run on
+        os: [ubuntu-latest, ubuntu-22.04]
     runs-on: ${{ matrix.os }}
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Install latest ARM toolchains
-      - uses: carlosperate/arm-none-eabi-gcc-action@v1
+      ###########################################
+      # Install toolchains for ubuntu-latest
+      - name: Install ARM toolchain (ubuntu latest)
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        uses: carlosperate/arm-none-eabi-gcc-action@v1
         with:
           release: 'latest'
-      # Install latest RISC-V toolchains, uses xPack
-      # https://xpack-dev-tools.github.io/
-      - name: setup-riscv-toolchain
+      - name: Install RISC-V toolchain (ubuntu latest)
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        # Install latest RISC-V toolchains, uses xPack
+        # https://xpack-dev-tools.github.io/
         run: |
           npm install --location=global xpm@latest
           xpm install --global @xpack-dev-tools/riscv-none-elf-gcc@latest
           tree -a "$HOME/.local/xPacks/@xpack-dev-tools/riscv-none-elf-gcc/" || echo "nope"
           echo "$HOME/.local/xPacks/@xpack-dev-tools/riscv-none-elf-gcc/14.2.0-3.1/.content/bin" >> "$GITHUB_PATH"
-      # Report what's installed
+
+      ###########################################
+      # Install toolchains for ubuntu LTS
+      # Use apt to ensure we are matching 'out of the box' LTS
+      - name: Install Toolchains
+        if: ${{ matrix.os == 'ubuntu-22.04' }}
+        run: sudo apt-get install -y gcc-arm-none-eabi gcc-riscv64-unknown-elf
+
+      ###########################################
+      # Report what toolchains are installed
       - name: report-toolchain-versions
         run: |
           arm-none-eabi-gcc --version
-          riscv-none-elf-gcc --version
+          riscv-none-elf-gcc --version || riscv64-unknown-elf-gcc --version
+
       ###########################################
       # libtock-c specific build steps begin here
       - uses: actions/checkout@v4
@@ -70,29 +83,3 @@ jobs:
       - name: ci-debug-build
         run: pushd examples/blink; make debug RAM_START=0x20004000 FLASH_INIT=0x30051 || exit; popd
 
-  # Build with compiler versions from the oldest current Ubuntu LTS
-  ci-build-legacy:
-    strategy:
-      matrix:
-        os: [ubuntu-22.04]
-    # The type of runner that the job will run on
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      # Install all toolchains with apt to ensure we are matching 'out of the box' LTS
-      - name: install-toolchains
-        run: sudo apt-get install -y gcc-arm-none-eabi gcc-riscv64-unknown-elf
-      - name: report-toolchain-versions
-        run: |
-          arm-none-eabi-gcc --version
-          riscv64-unknown-elf-gcc --version
-      ###########################################
-      # libtock-c specific build steps begin here
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          show-progress: false
-      - name: ci-build
-        run: pushd examples; ./build_all.sh || exit; popd
-      - name: ci-debug-build
-        run: pushd examples/blink; make debug RAM_START=0x20004000 FLASH_INIT=0x30051 || exit; popd