From f782ab6575881267e488d1dc01f00a2a666d6847 Mon Sep 17 00:00:00 2001 From: mattstam Date: Wed, 31 Jul 2024 18:31:56 -0700 Subject: [PATCH] same --- .github/workflows/ci.yml | 12 ++++-------- library/std/src/os/net/mod.rs | 1 - 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b7dfa30be57..9738c672134a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,14 +20,10 @@ jobs: triple: aarch64-unknown-linux-gnu runs-on: ${{ matrix.os }} steps: - - name: Install Rust Toolchain - uses: actions-rs/toolchain@v1 + - name: Install Rust + uses: risc0/actions-rs-toolchain@v1 with: - toolchain: nightly-2024-04-17 - profile: default - override: true - default: true - components: llvm-tools, rustc-dev + toolchain: stable - uses: lukka/get-cmake@v3.27.4 - name: Show rust version @@ -38,7 +34,7 @@ jobs: - name: Install SP1 toolchain run: | curl -L https://raw.githubusercontent.com/succinctlabs/sp1/mattstam/c-flags/sp1up/install | bash - export PATH=/home/runner/.sp1/bin:$PATH + export PATH=~/.sp1/bin:$PATH ~/.sp1/bin/sp1up --version dev --c-toolchain ~/.sp1/bin/cargo-prove prove --version diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs index 31a79fcd5702..b7046dd7c598 100644 --- a/library/std/src/os/net/mod.rs +++ b/library/std/src/os/net/mod.rs @@ -5,7 +5,6 @@ #[cfg(not(all( doc, any( - target_os = "zkvm", all(target_arch = "wasm32", not(target_os = "wasi")), all(target_vendor = "fortanix", target_env = "sgx") )