Skip to content

Commit

Permalink
Switch Rust toolchains
Browse files Browse the repository at this point in the history
Signed-off-by: James Bornholt <bornholt@amazon.com>
  • Loading branch information
jamesbornholt committed Mar 12, 2024
1 parent cfd46aa commit eb9578c
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 68 deletions.
15 changes: 3 additions & 12 deletions .github/workflows/bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,7 @@ jobs:
libunwind: true
fio: true
- name: Set up stable Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
uses: dtolnay/rust-toolchain@stable
- name: Build
run: cargo build --release
- name: Run Benchmark
Expand Down Expand Up @@ -95,10 +92,7 @@ jobs:
libunwind: true
fio: true
- name: Set up stable Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
uses: dtolnay/rust-toolchain@stable
- name: Build
run: cargo build --release
- name: Run Benchmark
Expand Down Expand Up @@ -144,10 +138,7 @@ jobs:
libunwind: true
fio: true
- name: Set up stable Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
uses: dtolnay/rust-toolchain@stable
- name: Build
run: cargo build --release
- name: Run Benchmark
Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/bench_s3express.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,7 @@ jobs:
libunwind: true
fio: true
- name: Set up stable Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
uses: dtolnay/rust-toolchain@stable
- name: Build
run: cargo build --release
- name: Run Benchmark
Expand Down Expand Up @@ -96,10 +93,7 @@ jobs:
libunwind: true
fio: true
- name: Set up stable Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
uses: dtolnay/rust-toolchain@stable
- name: Restore Cargo cache
id: restore-cargo-cache
uses: actions/cache/restore@v3
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/crates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@ jobs:
with:
submodules: true
- name: Set up stable Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
uses: dtolnay/rust-toolchain@stable
- name: Package ${{ matrix.crate }} crate
# `--no-verify` avoids building using crates.io dependencies, which for local packages may not be updated yet
run: cargo package -p ${{ matrix.crate }} --no-verify
Expand Down
14 changes: 3 additions & 11 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,7 @@ jobs:
submodules: true
persist-credentials: false
- name: Set up stable Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
uses: dtolnay/rust-toolchain@stable
- name: Install operating system dependencies
uses: ./.github/actions/install-dependencies
with:
Expand Down Expand Up @@ -120,10 +117,7 @@ jobs:
submodules: true
persist-credentials: false
- name: Set up stable Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
uses: dtolnay/rust-toolchain@stable
- name: Install operating system dependencies
uses: ./.github/actions/install-dependencies
with:
Expand Down Expand Up @@ -153,10 +147,8 @@ jobs:
ref: ${{ inputs.ref }}
submodules: true
- name: Set up stable Rust
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
override: true
components: rust-src
- name: Install operating system dependencies
uses: ./.github/actions/install-dependencies
Expand Down
43 changes: 10 additions & 33 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,7 @@ jobs:
with:
fuseVersion: ${{ matrix.fuseVersion }}
- name: Set up stable Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
uses: dtolnay/rust-toolchain@stable
- name: Cargo cache
uses: actions/cache@v3
with:
Expand Down Expand Up @@ -68,10 +65,7 @@ jobs:
run: |
brew install --cask macfuse
- name: Set up stable Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
uses: dtolnay/rust-toolchain@stable
- name: Cargo cache
uses: actions/cache@v3
with:
Expand Down Expand Up @@ -101,10 +95,7 @@ jobs:
with:
fuseVersion: 2
- name: Set up stable Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
uses: dtolnay/rust-toolchain@stable
- name: Cargo cache
uses: actions/cache@v3
with:
Expand Down Expand Up @@ -132,10 +123,7 @@ jobs:
with:
fuseVersion: 2
- name: Set up stable Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
uses: dtolnay/rust-toolchain@stable
- name: Cargo cache
uses: actions/cache@v3
with:
Expand All @@ -159,10 +147,7 @@ jobs:
with:
submodules: true
- name: Set up stable Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
uses: dtolnay/rust-toolchain@stable
- name: Install operating system dependencies
uses: ./.github/actions/install-dependencies
with:
Expand All @@ -188,10 +173,8 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4
- name: Set up stable Rust
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
override: true
components: rustfmt
- name: Check format
run: make fmt-check
Expand All @@ -210,10 +193,8 @@ jobs:
with:
fuseVersion: 2
- name: Set up stable Rust
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
override: true
components: clippy
- name: Cargo cache
uses: actions/cache@v3
Expand All @@ -238,10 +219,9 @@ jobs:
with:
submodules: true
- name: Set up stable Rust
uses: actions-rs/toolchain@v1
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
override: true
components: rust-docs
- name: Cargo cache
uses: actions/cache@v3
with:
Expand All @@ -263,9 +243,6 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4
- name: Set up stable Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
uses: dtolnay/rust-toolchain@stable
- name: Run cargo deny
uses: EmbarkStudios/cargo-deny-action@v1

0 comments on commit eb9578c

Please sign in to comment.