actions: build all bitstreams in parallel, re-add r2/r3

Author: vk2seb

.github/workflows/main.yml

@@ -30,54 +30,11 @@ jobs:
       - run: RUST_LOG=debug cargo test
         working-directory: gateware/src/rs/opts
 
-  build-bootloader:
+  build-bitstreams-soc:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        config:
-          - name: bootloader
-            cmd: bootloader build --fw-location=spiflash
         hw_rev: ["r2", "r3", "r4"]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: pdm-project/setup-pdm@v4
-      - run: git submodule update --init --recursive
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: stable
-          components: rustfmt, clippy, llvm-tools
-          targets: riscv32im-unknown-none-elf
-      - run: |
-          cargo install cargo-binutils form
-          cargo install svd2rust --locked
-      - name: Install PDM dependencies
-        run: pdm install
-        working-directory: gateware
-      - name: Build ${{ matrix.config.cmd }} --hw ${{ matrix.hw_rev }}
-        run: pdm ${{ matrix.config.cmd }} --hw ${{ matrix.hw_rev }}
-        working-directory: gateware
-      - uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.config.name }}-${{ matrix.hw_rev }}.zip
-          path: gateware/build/*/*-*-*.tar.gz
-          retention-days: 1
-
-  build-soc-bitstream:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        config:
-          - name: selftest
-            cmd: selftest build
-          - name: xbeam
-            cmd: xbeam build --fs-192khz
-          - name: polysyn
-            cmd: polysyn build
-          - name: macro-osc
-            cmd: macro_osc build
-          - name: sid
-            cmd: sid build
-        hw_rev: ["r4"]
     steps:
       - uses: actions/checkout@v4
       - uses: pdm-project/setup-pdm@v4
@@ -93,32 +50,19 @@ jobs:
       - name: Install PDM dependencies
         run: pdm install
         working-directory: gateware
-      - name: Build ${{ matrix.config.cmd }} --hw ${{ matrix.hw_rev }}
-        run: pdm ${{ matrix.config.cmd }} --hw ${{ matrix.hw_rev }}
+      - name: Build all SoC bitstreams (${{ matrix.hw_rev }})
+        run: ./scripts/build_bitstreams_soc.sh --hw=${{ matrix.hw_rev }}
         working-directory: gateware
       - uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.config.name }}-${{ matrix.hw_rev }}.zip
+          name: bitstreams-soc-${{ matrix.hw_rev }}.zip
           path: gateware/build/*/*-*-*.tar.gz
           retention-days: 1
 
-  build-bitstream:
+  build-bitstreams-no-soc:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        config:
-          - name: usb-audio
-            cmd: usb_audio build
-          - name: usb-host
-            cmd: usb_host build --midi-device arturia-keylab49-mkii
-          - name: dsp-nco
-            cmd: dsp build --dsp-core nco
-          - name: dsp-diffuser
-            cmd: dsp build --dsp-core psram_diffuser
-          - name: vectorscope
-            cmd: vectorscope_no_soc build --fs-192khz
-          - name: bootstub
-            cmd: bootstub build --bootaddr 0x100000
         hw_rev: ["r2", "r3", "r4"]
     steps:
       - uses: actions/checkout@v4
@@ -127,12 +71,12 @@ jobs:
       - name: Install PDM dependencies
         run: pdm install
         working-directory: gateware
-      - name: Build ${{ matrix.config.cmd }} --hw ${{ matrix.hw_rev }}
-        run: pdm ${{ matrix.config.cmd }} --hw ${{ matrix.hw_rev }}
+      - name: Build all non-SoC bitstreams (${{ matrix.hw_rev }})
+        run: ./scripts/build_bitstreams_no_soc.sh --hw=${{ matrix.hw_rev }}
         working-directory: gateware
       - uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.config.name }}-${{ matrix.hw_rev }}.zip
+          name: bitstreams-no-soc-${{ matrix.hw_rev }}.zip
           path: gateware/build/*/*-*-*.tar.gz
           retention-days: 1
 
@@ -159,7 +103,7 @@ jobs:
         working-directory: gateware
 
   package-artifacts:
-    needs: [build-bootloader, build-bitstream, build-soc-bitstream]
+    needs: [build-bitstreams-soc, build-bitstreams-no-soc]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/download-artifact@v4