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

Jump to bottom

Pin Rust to 1.81.0 #1073

Merged
merged 5 commits into from
Oct 22, 2024
Merged

Pin Rust to 1.81.0 #1073

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
39a54c7
Pin Rust to 1.81.0
unexge Oct 21, 2024
aafb911
Revert GitHub action changes
unexge Oct 21, 2024
d986a49
Use `actions-rust-lang/setup-rust-toolchain@v1` to install Rust
unexge Oct 21, 2024
1dbd800
Disable default RUSTFLAGS
unexge Oct 21, 2024
9f4e760
Add `rust-src` to components in `rust-toolchain.toml`
unexge Oct 21, 2024
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
19 changes: 13 additions & 6 deletions .github/workflows/bench.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ on:

env:
RUST_BACKTRACE: 1
RUST_TOOLCHAIN: "1.81.0"
CARGO_TERM_COLOR: always
S3_BUCKET_NAME: ${{ vars.S3_BENCH_BUCKET_NAME }}
S3_BUCKET_TEST_PREFIX: ${{ vars.S3_BUCKET_BENCH_PREFIX || 'mountpoint-benchmark/' }}
Expand Down Expand Up @@ -51,8 +52,10 @@ jobs:
fuseVersion: 2
libunwind: true
fio: true
- name: Set up stable Rust
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust toolchain
uses: dtolnay/rust-toolchain@master
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My suggestion was to remove this step entirely, not to revert to stable

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alternative: we could look at some other actions, e.g. https://github.com/marketplace/actions/rust-toolchain-toml-install

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agh, I misunderstood. I think dtolnay/rust-toolchain installs rustup/cargo. We might look installing it in .github/actions/install-dependencies step, not sure if there are any downsides.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was wondering about jumping to a new action, I saw this one that looks well maintained: https://github.com/actions-rust-lang/setup-rust-toolchain

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated to use actions-rust-lang/setup-rust-toolchain. I had to override rustflags option though, it's -D warnings by default which turns all warnings into compile errors, and vendor/fuser has lots of warnings. It'd be nice to get rid of those warnings eventually, but not turning this on should be fine for now.

This new action also surfaces warnings on PRs, e.g., scroll to the bottom on https://github.com/awslabs/mountpoint-s3/pull/1073/files. We can turn this of it we find it noisy, but eventually I'd like to address these warnings as well.

with:
toolchain: ${{ env.RUST_TOOLCHAIN }}
- name: Build
run: cargo build --release
- name: Run Benchmark
Expand Down Expand Up @@ -121,8 +124,10 @@ jobs:
fuseVersion: 2
libunwind: true
fio: true
- name: Set up stable Rust
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust toolchain
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_TOOLCHAIN }}
- name: Build
run: cargo build --release
- name: Run Benchmark
Expand Down Expand Up @@ -175,8 +180,10 @@ jobs:
fuseVersion: 2
libunwind: true
fio: true
- name: Set up stable Rust
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust toolchain
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_TOOLCHAIN }}
- name: Build
run: cargo build --release
- name: Run Benchmark
Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/bench_s3express.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ on:

env:
RUST_BACKTRACE: 1
RUST_TOOLCHAIN: "1.81.0"
CARGO_TERM_COLOR: always
S3_BUCKET_NAME: ${{ vars.S3_EXPRESS_ONE_ZONE_BENCH_BUCKET_NAME }}
S3_BUCKET_TEST_PREFIX: ${{ vars.S3_BUCKET_BENCH_PREFIX || 'mountpoint-benchmark/' }}
Expand Down Expand Up @@ -51,8 +52,10 @@ jobs:
fuseVersion: 2
libunwind: true
fio: true
- name: Set up stable Rust
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust toolchain
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_TOOLCHAIN }}
- name: Build
run: cargo build --release
- name: Run Benchmark
Expand Down Expand Up @@ -120,8 +123,10 @@ jobs:
fuseVersion: 2
libunwind: true
fio: true
- name: Set up stable Rust
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust toolchain
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_TOOLCHAIN }}
- name: Build
run: cargo build --release
- name: Run Benchmark
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/crates.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: Crate checks

env:
RUST_TOOLCHAIN: "1.81.0"

on:
push:
branches: [ "main" ]
Expand All @@ -23,8 +26,10 @@ jobs:
uses: actions/checkout@v4
with:
submodules: true
- name: Set up stable Rust
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust toolchain
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_TOOLCHAIN }}
- 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
18 changes: 12 additions & 6 deletions .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:

env:
RUST_BACKTRACE: 1
RUST_TOOLCHAIN: "1.81.0"
CARGO_TERM_COLOR: always
CARGO_INCREMENTAL: 0
S3_BUCKET_NAME: ${{ vars.S3_BUCKET_NAME }}
Expand Down Expand Up @@ -71,8 +72,10 @@ 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: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_TOOLCHAIN }}
- name: Install operating system dependencies
uses: ./.github/actions/install-dependencies
with:
Expand Down Expand Up @@ -119,8 +122,10 @@ 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: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_TOOLCHAIN }}
- name: Install operating system dependencies
uses: ./.github/actions/install-dependencies
with:
Expand Down Expand Up @@ -156,9 +161,10 @@ jobs:
with:
ref: ${{ inputs.ref }}
submodules: true
- name: Set up stable Rust
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust toolchain
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_TOOLCHAIN }}
components: rust-src
- name: Install operating system dependencies
uses: ./.github/actions/install-dependencies
Expand Down
54 changes: 35 additions & 19 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:

env:
RUST_BACKTRACE: 1
RUST_TOOLCHAIN: "1.81.0"
CARGO_TERM_COLOR: always
CARGO_INCREMENTAL: 0
RUST_FEATURES: fuse_tests
Expand All @@ -31,8 +32,10 @@ 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: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_TOOLCHAIN }}
- name: Cargo cache
uses: actions/cache@v3
with:
Expand Down Expand Up @@ -63,8 +66,10 @@ 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: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_TOOLCHAIN }}
- name: Cargo cache
uses: actions/cache@v3
with:
Expand Down Expand Up @@ -93,8 +98,10 @@ 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: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_TOOLCHAIN }}
- name: Cargo cache
uses: actions/cache@v3
with:
Expand All @@ -121,8 +128,10 @@ 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: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_TOOLCHAIN }}
- name: Cargo cache
uses: actions/cache@v3
with:
Expand All @@ -145,8 +154,10 @@ jobs:
uses: actions/checkout@v4
with:
submodules: true
- name: Set up stable Rust
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust toolchain
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_TOOLCHAIN }}
- name: Install operating system dependencies
uses: ./.github/actions/install-dependencies
with:
Expand All @@ -171,9 +182,10 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Set up stable Rust
uses: dtolnay/rust-toolchain@stable
with:
- name: Set up Rust toolchain
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_TOOLCHAIN }}
components: rustfmt
- name: Check format
run: make fmt-check
Expand All @@ -191,9 +203,10 @@ 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: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_TOOLCHAIN }}
components: clippy
- name: Cargo cache
uses: actions/cache@v3
Expand All @@ -217,9 +230,10 @@ jobs:
uses: actions/checkout@v4
with:
submodules: true
- name: Set up stable Rust
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust toolchain
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_TOOLCHAIN }}
components: rust-docs
- name: Cargo cache
uses: actions/cache@v3
Expand All @@ -241,7 +255,9 @@ 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: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUST_TOOLCHAIN }}
- name: Run cargo deny
uses: EmbarkStudios/cargo-deny-action@v1
2 changes: 2 additions & 0 deletions rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[toolchain]
channel = "1.81.0"
Loading