Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch to remove nightly channel requirement for cargo #241

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Patch to remove nightly channel requirement for cargo #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
286f5f6
Patch to remove nightly channel rquirement for cargo
jlb6740 Jun 6, 2023
baced09
Remove remainder of `nightly` uses
abrown Jul 6, 2023
5dac3a5
Add 'toolchain: stable' back in
abrown Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/benchmarks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install nightly
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: nightly
toolchain: stable
- name: Rebuild benchmarks
run: benchmarks/build-all.sh 5

run:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install nightly
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: nightly
toolchain: stable
- name: Run benchmarks
run: benchmarks/run-all.sh

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/benchmarks_native.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install nightly
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: nightly
toolchain: stable
- name: Rebuild benchmarks docker
run: benchmarks/build-all-native.sh --run
run: benchmarks/build-all-native.sh --run
8 changes: 4 additions & 4 deletions .github/workflows/sightglass.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Install nightly
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: nightly
toolchain: stable

- name: Download Cached Wasmtime engine
uses: actions/cache@v2
Expand All @@ -57,7 +57,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
2 changes: 1 addition & 1 deletion benchmarks/Dockerfile.native
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/run-all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion benchmarks/run-native.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down