fix

Author: SchmErik

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
           - os: Linux
             arch: X64
             triple: x86_64-unknown-linux-gnu
-    runs-on: [ self-hosted, prod, "${{ matrix.os }}", "${{ matrix.arch }}" ]
+    runs-on: [ self-hosted, release, "${{ matrix.os }}", "${{ matrix.arch }}" ]
     steps:
       - name: Install Rust
         uses: risc0/actions-rs-toolchain@v1
@@ -46,11 +46,19 @@ jobs:
         run: GITHUB_ACTIONS=false cargo run --bin rzup -- build rust --path $GITHUB_WORKSPACE/rust
         working-directory: risc0
 
-      - name: Archive build output
-        uses: actions/upload-artifact@v4
+      - name: "Archive toolchain"
+        run: |
+          tar \
+            --exclude lib/rustlib/src \
+            --exclude lib/rustlib/rustc-src \
+            -hczvf \
+            ./rust-toolchain-${{ matrix.triple }}.tar.gz \
+            -C ./build/${{ matrix.triple }}/stage2/ \
+            .
+        working-directory: rust
+
+      - name: "Upload workflow artifact"
+        uses: "actions/upload-artifact@v4"
         with:
-          name: rust-toolchain-${{ matrix.triple }}
-          path: |
-            rust/build/${{ matrix.triple }}/stage2
-            !rust/build/${{ matrix.triple }}/stage2/lib/rustlib/src
-            !rust/build/${{ matrix.triple }}/stage2/lib/rustlib/rustc-src
+          name: "rust-toolchain-${{ matrix.triple }}.tar.gz"
+          path: "rust/rust-toolchain-${{ matrix.triple }}.tar.gz"

.github/workflows/dependencies.yml

@@ -56,7 +56,7 @@ jobs:
       - name: install the bootstrap toolchain
         run: |
           # Extract the stage0 version
-          TOOLCHAIN=$(jq -r '.compiler | {version,date} | join("-")' -- src/stage0.json)
+          TOOLCHAIN=$(awk -F= '{a[$1]=$2} END {print(a["compiler_version"] "-" a["compiler_date"])}' src/stage0)
           # Install and set as default
           rustup toolchain install --no-self-update --profile minimal $TOOLCHAIN
           rustup default $TOOLCHAIN

.github/workflows/release.yml

@@ -18,15 +18,9 @@ jobs:
       uses: actions/download-artifact@v4
       with:
         path: artifacts
-    - name: Compress artifacts
-      shell: bash
-      run: |
-        ls -lha ./artifacts
-        mkdir assets
-        for DIR in $(ls ./artifacts); do
-          tar czf "assets/$DIR.tar.gz" -C "artifacts/$DIR" .
-        done
-        ls -lha ./assets
+        merge-multiple: true
+    - name: Display structure of downloaded artifacts
+      run: ls -R ./artifacts
     - name: Create release
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -36,5 +30,5 @@ jobs:
           tar xvz  --strip-components=2 --exclude=man
         chmod +x ./gh
 
-        ./gh release create --repo "$GITHUB_REPOSITORY" "$GITHUB_REF_NAME" ./assets/* || \
-        ./gh release upload --repo "$GITHUB_REPOSITORY" "$GITHUB_REF_NAME" ./assets/*
+        ./gh release create --repo "$GITHUB_REPOSITORY" "$GITHUB_REF_NAME" ./artifacts/* || \
+        ./gh release upload --repo "$GITHUB_REPOSITORY" "$GITHUB_REF_NAME" ./artifacts/*