diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 70da612190d4..5a2d37ed7eb5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,38 +9,44 @@ on: workflow_dispatch: jobs: - build: + build-ubuntu-x86: runs-on: buildjet-32vcpu-ubuntu-2204 steps: - name: Install Rust - uses: risc0/actions-rs-toolchain@v1 + uses: actions-rs/toolchain@v1 with: toolchain: stable - - uses: lukka/get-cmake@v3.27.4 - - name: Check out risc0/rust + - name: Install ninja and cmake + uses: lukka/get-cmake@v3.27.4 + + - name: Check out succinctlabs/rust uses: actions/checkout@v3 with: submodules: 'recursive' path: rust fetch-depth: 0 - - name: Check out risc0/risc0 + - name: Check out succinctlabs/vm uses: actions/checkout@v3 with: - repository: risc0/risc0 - ref: main - path: risc0 + repository: succinctlabs/vm + path: vm + ref: john/cargo-succinct-build-toolchain + token: ${{ secrets.PRIVATE_PULL_TOKEN }} + + - name: Install cargo prove + run: cargo install --locked --path . + working-directory: vm/cli - - name: Build - run: GITHUB_ACTIONS=false RISC0_BUILD_DIR=$GITHUB_WORKSPACE cargo run --bin cargo-risczero -- risczero build-toolchain - working-directory: risc0 + - name: Build toolchain + run: GITHUB_ACTIONS=false GITHUB_ACCESS_TOKEN=${{ secrets.PRIVATE_PULL_TOKEN }} SUCCINCT_BUILD_DIR=$GITHUB_WORKSPACE cargo prove build-toolchain - name: Archive build output uses: actions/upload-artifact@v3 with: - name: rust-toolchain-${{ matrix.triple }} + name: rust-toolchain-x86_64-unknown-linux-gnu path: | rust/build/x86_64-unknown-linux-gnu/stage2 !rust/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/src - !rust/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/rustc-src + !rust/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/rustc-src \ No newline at end of file