Skip to content

Commit

Permalink
Pin Rust to 1.81.0 (#1073)
Browse files Browse the repository at this point in the history
* Pin Rust to 1.81.0

Signed-off-by: Burak Varlı <burakvar@amazon.co.uk>

* Revert GitHub action changes

Signed-off-by: Burak Varlı <burakvar@amazon.co.uk>

* Use `actions-rust-lang/setup-rust-toolchain@v1` to install Rust

Signed-off-by: Burak Varlı <burakvar@amazon.co.uk>

* Disable default RUSTFLAGS

Signed-off-by: Burak Varlı <burakvar@amazon.co.uk>

* Add `rust-src` to components in `rust-toolchain.toml`

Signed-off-by: Burak Varlı <burakvar@amazon.co.uk>

---------

Signed-off-by: Burak Varlı <burakvar@amazon.co.uk>
  • Loading branch information
unexge authored Oct 22, 2024
1 parent 7d43629 commit 39c58a1
Show file tree
Hide file tree
Showing 6 changed files with 107 additions and 36 deletions.
24 changes: 18 additions & 6 deletions .github/workflows/bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,12 @@ jobs:
fuseVersion: 2
libunwind: true
fio: true
- name: Set up stable Rust
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust toolchain
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
# setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
# We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
rustflags: ""
- name: Build
run: cargo build --release
- name: Run Benchmark
Expand Down Expand Up @@ -121,8 +125,12 @@ jobs:
fuseVersion: 2
libunwind: true
fio: true
- name: Set up stable Rust
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust toolchain
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
# setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
# We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
rustflags: ""
- name: Build
run: cargo build --release
- name: Run Benchmark
Expand Down Expand Up @@ -175,8 +183,12 @@ jobs:
fuseVersion: 2
libunwind: true
fio: true
- name: Set up stable Rust
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust toolchain
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
# setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
# We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
rustflags: ""
- name: Build
run: cargo build --release
- name: Run Benchmark
Expand Down
16 changes: 12 additions & 4 deletions .github/workflows/bench_s3express.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,12 @@ jobs:
fuseVersion: 2
libunwind: true
fio: true
- name: Set up stable Rust
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust toolchain
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
# setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
# We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
rustflags: ""
- name: Build
run: cargo build --release
- name: Run Benchmark
Expand Down Expand Up @@ -120,8 +124,12 @@ jobs:
fuseVersion: 2
libunwind: true
fio: true
- name: Set up stable Rust
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust toolchain
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
# setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
# We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
rustflags: ""
- name: Build
run: cargo build --release
- name: Run Benchmark
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/crates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,12 @@ jobs:
uses: actions/checkout@v4
with:
submodules: true
- name: Set up stable Rust
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust toolchain
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
# setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
# We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
rustflags: ""
- 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
23 changes: 17 additions & 6 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,12 @@ jobs:
ref: ${{ inputs.ref }}
submodules: true
persist-credentials: false
- name: Set up stable Rust
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust toolchain
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
# setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
# We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
rustflags: ""
- name: Install operating system dependencies
uses: ./.github/actions/install-dependencies
with:
Expand Down Expand Up @@ -119,8 +123,12 @@ jobs:
ref: ${{ inputs.ref }}
submodules: true
persist-credentials: false
- name: Set up stable Rust
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust toolchain
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
# setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
# We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
rustflags: ""
- name: Install operating system dependencies
uses: ./.github/actions/install-dependencies
with:
Expand Down Expand Up @@ -156,9 +164,12 @@ jobs:
with:
ref: ${{ inputs.ref }}
submodules: true
- name: Set up stable Rust
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust toolchain
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
# setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
# We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
rustflags: ""
components: rust-src
- name: Install operating system dependencies
uses: ./.github/actions/install-dependencies
Expand Down
69 changes: 51 additions & 18 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,12 @@ jobs:
uses: ./.github/actions/install-dependencies
with:
fuseVersion: ${{ matrix.fuseVersion }}
- name: Set up stable Rust
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust toolchain
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
# setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
# We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
rustflags: ""
- name: Cargo cache
uses: actions/cache@v3
with:
Expand Down Expand Up @@ -63,8 +67,12 @@ jobs:
- name: Install fuse
run: |
brew install --cask macfuse
- name: Set up stable Rust
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust toolchain
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
# setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
# We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
rustflags: ""
- name: Cargo cache
uses: actions/cache@v3
with:
Expand Down Expand Up @@ -93,8 +101,12 @@ jobs:
uses: ./.github/actions/install-dependencies
with:
fuseVersion: 2
- name: Set up stable Rust
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust toolchain
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
# setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
# We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
rustflags: ""
- name: Cargo cache
uses: actions/cache@v3
with:
Expand All @@ -121,8 +133,12 @@ jobs:
uses: ./.github/actions/install-dependencies
with:
fuseVersion: 2
- name: Set up stable Rust
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust toolchain
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
# setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
# We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
rustflags: ""
- name: Cargo cache
uses: actions/cache@v3
with:
Expand All @@ -145,8 +161,12 @@ jobs:
uses: actions/checkout@v4
with:
submodules: true
- name: Set up stable Rust
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust toolchain
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
# setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
# We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
rustflags: ""
- name: Install operating system dependencies
uses: ./.github/actions/install-dependencies
with:
Expand All @@ -171,9 +191,12 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Set up stable Rust
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust toolchain
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
# setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
# We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
rustflags: ""
components: rustfmt
- name: Check format
run: make fmt-check
Expand All @@ -191,9 +214,12 @@ jobs:
uses: ./.github/actions/install-dependencies
with:
fuseVersion: 2
- name: Set up stable Rust
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust toolchain
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
# setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
# We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
rustflags: ""
components: clippy
- name: Cargo cache
uses: actions/cache@v3
Expand All @@ -217,9 +243,12 @@ jobs:
uses: actions/checkout@v4
with:
submodules: true
- name: Set up stable Rust
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust toolchain
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
# setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
# We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
rustflags: ""
components: rust-docs
- name: Cargo cache
uses: actions/cache@v3
Expand All @@ -241,7 +270,11 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Set up stable Rust
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust toolchain
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
# setup-rust-toolchain sets "-D warnings" by default, and Rust treats any warning as compile error.
# We need to this currently because `vendor/fuser` contains some warnings and it breaks the build.
rustflags: ""
- name: Run cargo deny
uses: EmbarkStudios/cargo-deny-action@v1
3 changes: 3 additions & 0 deletions rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[toolchain]
channel = "1.81.0"
components = ["rust-src"]

0 comments on commit 39c58a1

Please sign in to comment.