From 286f5f63d1757a556c15d1beda1ef263cfee575d Mon Sep 17 00:00:00 2001 From: Johnnie Birch Date: Tue, 6 Jun 2023 13:51:58 -0700 Subject: [PATCH 1/3] Patch to remove nightly channel rquirement for cargo --- benchmarks/run-all.sh | 2 +- benchmarks/run-native.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/benchmarks/run-all.sh b/benchmarks/run-all.sh index 8aabaae5..34f9a0cb 100755 --- a/benchmarks/run-all.sh +++ b/benchmarks/run-all.sh @@ -9,7 +9,7 @@ set -e SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]:-$0}"; )" &> /dev/null && pwd 2> /dev/null; )"; SUITE=$SCRIPT_DIR/all.suite PROJECT_DIR=$(dirname $SCRIPT_DIR) -SIGHTGLASS="cargo +nightly run --bin sightglass-cli --" +SIGHTGLASS="cargo run --bin sightglass-cli --" ENGINE=$PROJECT_DIR/engines/wasmtime/libengine.so export RUST_LOG=debug diff --git a/benchmarks/run-native.sh b/benchmarks/run-native.sh index 78075302..a31c35eb 100755 --- a/benchmarks/run-native.sh +++ b/benchmarks/run-native.sh @@ -9,7 +9,7 @@ set -e BENCHMARKS_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) SIGHTGLASS_BASE=$(dirname $BENCHMARKS_DIR) -SIGHTGLASS="cargo +nightly run --release --bin sightglass-cli --" +SIGHTGLASS="cargo run --release --bin sightglass-cli --" ENGINE=$SIGHTGLASS_BASE/engines/native/libengine.so From baced09cb6c59068353b4b0963a69d7dff48ba97 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Thu, 6 Jul 2023 10:29:06 -0700 Subject: [PATCH 2/3] Remove remainder of `nightly` uses --- .github/workflows/benchmarks.yml | 8 ++------ .github/workflows/benchmarks_native.yaml | 6 ++---- .github/workflows/sightglass.yml | 8 +++----- benchmarks/Dockerfile.native | 2 +- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index db1a3281..34af9c7d 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -16,10 +16,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Install nightly + - name: Install Rust uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - name: Rebuild benchmarks run: benchmarks/build-all.sh 5 @@ -27,10 +25,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Install nightly + - name: Install Rust uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - name: Run benchmarks run: benchmarks/run-all.sh diff --git a/.github/workflows/benchmarks_native.yaml b/.github/workflows/benchmarks_native.yaml index c9d11d1a..15b386c8 100644 --- a/.github/workflows/benchmarks_native.yaml +++ b/.github/workflows/benchmarks_native.yaml @@ -12,9 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Install nightly + - name: Install Rust uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - name: Rebuild benchmarks docker - run: benchmarks/build-all-native.sh --run \ No newline at end of file + run: benchmarks/build-all-native.sh --run diff --git a/.github/workflows/sightglass.yml b/.github/workflows/sightglass.yml index 8c47e37f..caf01cf7 100644 --- a/.github/workflows/sightglass.yml +++ b/.github/workflows/sightglass.yml @@ -37,10 +37,8 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Install nightly + - name: Install Rust uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - name: Download Cached Wasmtime engine uses: actions/cache@v2 @@ -57,7 +55,7 @@ jobs: ./build - name: Build all - run: cargo +nightly build --verbose --all + run: cargo build --verbose --all - name: Test all - run: cargo +nightly test --verbose --all + run: cargo test --verbose --all diff --git a/benchmarks/Dockerfile.native b/benchmarks/Dockerfile.native index b6d02fb1..3ad44dad 100644 --- a/benchmarks/Dockerfile.native +++ b/benchmarks/Dockerfile.native @@ -1,6 +1,6 @@ FROM ubuntu:20.04 ENV DEBIAN_FRONTEND="noninteractive" TZ="America" -ARG RUST_VERSION="nightly-2022-04-24" +ARG RUST_VERSION="1.70.0" RUN apt update && apt-get install -y --no-install-recommends curl ca-certificates build-essential # Install rust From 5dac3a582e0f8b41a5866525aab4bfcec009003a Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Fri, 7 Jul 2023 10:56:18 -0700 Subject: [PATCH 3/3] Add 'toolchain: stable' back in --- .github/workflows/benchmarks.yml | 4 ++++ .github/workflows/benchmarks_native.yaml | 2 ++ .github/workflows/sightglass.yml | 2 ++ 3 files changed, 8 insertions(+) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 34af9c7d..2b3de5dc 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -18,6 +18,8 @@ jobs: - uses: actions/checkout@v2 - name: Install Rust uses: actions-rs/toolchain@v1 + with: + toolchain: stable - name: Rebuild benchmarks run: benchmarks/build-all.sh 5 @@ -27,6 +29,8 @@ jobs: - uses: actions/checkout@v2 - name: Install Rust uses: actions-rs/toolchain@v1 + with: + toolchain: stable - name: Run benchmarks run: benchmarks/run-all.sh diff --git a/.github/workflows/benchmarks_native.yaml b/.github/workflows/benchmarks_native.yaml index 15b386c8..9ccbd2bb 100644 --- a/.github/workflows/benchmarks_native.yaml +++ b/.github/workflows/benchmarks_native.yaml @@ -14,5 +14,7 @@ jobs: - uses: actions/checkout@v2 - name: Install Rust uses: actions-rs/toolchain@v1 + with: + toolchain: stable - name: Rebuild benchmarks docker run: benchmarks/build-all-native.sh --run diff --git a/.github/workflows/sightglass.yml b/.github/workflows/sightglass.yml index caf01cf7..b7c53f77 100644 --- a/.github/workflows/sightglass.yml +++ b/.github/workflows/sightglass.yml @@ -39,6 +39,8 @@ jobs: - name: Install Rust uses: actions-rs/toolchain@v1 + with: + toolchain: stable - name: Download Cached Wasmtime engine uses: actions/cache@v2