Simplify package and add new GHA workflows

Author: lrettig

.github/workflows/ci.yml

@@ -0,0 +1,62 @@
+name: CI
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-latest
+            triple: x86_64-unknown-linux-gnu
+          # - os: macos-14
+          #   triple: aarch64-apple-darwin
+          # - os: macos-13
+          #   triple: x86_64-apple-darwin
+          # - os: buildjet-32vcpu-ubuntu-2004
+          #   triple: x86_64-unknown-linux-gnu
+          # - os: buildjet-32vcpu-ubuntu-2204-arm
+          #   triple: aarch64-unknown-linux-gnu
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Install nightly toolchain
+        id: rustc-toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly-2024-01-25
+          default: true
+
+      - uses: lukka/get-cmake@v3.27.4
+
+      - name: Show rust version
+        run: |
+          cargo version
+          rustup toolchain list
+
+      - name: Check out succinctlabs/rust
+        uses: actions/checkout@v3
+        with:
+          repository: succinctlabs/rust
+          path: rust
+          fetch-depth: 0
+
+      - name: Check out athenavm/athena
+        uses: actions/checkout@v3
+        with:
+          repository: athenavm/athena
+          ref: main
+          path: athena
+
+      - name: Build
+        run: GITHUB_ACTIONS=false ATHENA_BUILD_DIR=$GITHUB_WORKSPACE cargo run --bin cargo-athena -- athena build-toolchain
+        working-directory: athena
+
+      - name: Archive build output
+        uses: actions/upload-artifact@v3
+        with:
+          name: rust-toolchain-${{ matrix.triple }}
+          path: |
+            athena/rust-toolchain-${{ matrix.triple }}.tar.gz

.github/workflows/release.yml

@@ -0,0 +1,33 @@
+name: Release
+on:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  build:
+    uses: ./.github/workflows/ci.yml
+
+  release:
+    needs: build
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v3
+        with:
+          path: artifacts
+      - name: Create release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          echo "Installing gh CLI..."
+          curl -L https://github.com/cli/cli/releases/download/v2.17.0/gh_2.17.0_linux_amd64.tar.gz | \
+            tar xvz  --strip-components=2 --exclude=man
+          chmod +x ./gh
+          mkdir tars
+          mv ./artifacts/*/*.tar.gz tars/
+
+          ./gh release create --repo "$GITHUB_REPOSITORY" "$GITHUB_REF_NAME" ./tars/* || \
+          ./gh release upload --repo "$GITHUB_REPOSITORY" "$GITHUB_REF_NAME" ./tars/*

package.sh

@@ -4,47 +4,6 @@ set -euo pipefail
 
 source config.sh
 
-# We generally remove files as soon as we don't need them
-# anymore to minimize disk space usage. Especially important for github runners
-# which don't have much space.
-
-inst () {
-    echo "Installing: $1"
-    tar -xf ../$1.tar.gz
-    # eager remove to reduce max disk space used
-    rm ../$1.tar.gz
-    cd $1
-    ./install.sh --disable-ldconfig --prefix="" --destdir="/tmp/$TOOLCHAIN_NAME"
-    cd ../
-}
-
-# dist contains the tared components we want to install
-mv rust/build/dist .
-#rm -rf rust
-
-cd dist
-mkdir unpack
-cd unpack
-
-inst "rustc-nightly-$TOOLCHAIN_HOST_TRIPLET"
-inst "rust-std-nightly-$TOOLCHAIN_HOST_TRIPLET"
-inst "rust-std-nightly-riscv32em-athena-zkvm-elf"
-inst "cargo-nightly-$TOOLCHAIN_HOST_TRIPLET"
-inst "rust-src-nightly"
-inst "rustfmt-nightly-$TOOLCHAIN_HOST_TRIPLET"
-inst "clippy-nightly-$TOOLCHAIN_HOST_TRIPLET"
-
-cd ..
-rm -rf unpack
-
-cd ../
-
-# remove the /tmp/ prefix from the manifest to make it path independent
-sed -i'' -e "s#/tmp/$TOOLCHAIN_NAME/##g" /tmp/$TOOLCHAIN_NAME/lib/rustlib/manifest-*
-rm -f /tmp/$TOOLCHAIN_NAME/lib/rustlib/install.log
-
-# the final toolchain tar that can just be extracted anywhere to install it
-tar --zstd -cf $ARTIFACT_NAME.tar.zst -C /tmp $TOOLCHAIN_NAME
-
-rm -rf dist
-rm -rf /tmp/$TOOLCHAIN_NAME
+TOOLCHAIN_DIR=rust/build/$TOOLCHAIN_HOST_TRIPLET/stage2
+cp -n rust/build/$TOOLCHAIN_HOST_TRIPLET/stage2-tools-bin/* $TOOLCHAIN_DIR/bin
+tar --exclude lib/rustlib/src --exclude lib/rustlib/rustc-src -hczvf rust-toolchain-$TOOLCHAIN_NAME.tar.gz -C $TOOLCHAIN_DIR .