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

Bump MSRV to 1.80 #9496

Merged
merged 3 commits into from
Oct 22, 2024
Merged

Bump MSRV to 1.80 #9496

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
2891f36
Bump MSRV to 1.80
alexcrichton Oct 22, 2024
989f7f7
Update rust installation in CI
alexcrichton Oct 22, 2024
8373b3f
Undo most of the nightly update
alexcrichton Oct 22, 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
12 changes: 2 additions & 10 deletions .github/actions/install-rust/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,7 @@ inputs:
msrv_range:
description: 'Versions later-than-latest-Rust the MSRV supports'
required: false
# Note that this is currently set to 3 as the MSRV is 1.78 and current
# stable is 1.81. Currently MSRV cannot be updated as it would break the
# build on OSS-Fuzz which hasn't updated its Rust compiler in quite some time.
#
# Updating OSS-Fuzz is being done in
# https://github.com/google/oss-fuzz/pull/12365 but it's taking some time,
# so for now this'll get bumped instead of MSRV while we wait for the update
# to happen.
default: '3'
default: '2'

runs:
using: composite
Expand All @@ -36,7 +28,7 @@ runs:
elif [ "${{ inputs.toolchain }}" = "msrv" ]; then
echo "version=1.$msrv.0" >> "$GITHUB_OUTPUT"
elif [ "${{ inputs.toolchain }}" = "wasmtime-ci-pinned-nightly" ]; then
echo "version=nightly-2024-10-01" >> "$GITHUB_OUTPUT"
echo "version=nightly-2024-10-02" >> "$GITHUB_OUTPUT"
else
echo "version=${{ inputs.toolchain }}" >> "$GITHUB_OUTPUT"
fi
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ authors = ["The Wasmtime Project Developers"]
edition = "2021"
# Wasmtime's current policy is that this number can be no larger than the
# current stable release of Rust minus 2.
rust-version = "1.78.0"
rust-version = "1.80.0"

[workspace.lints.rust]
# Turn on some lints which are otherwise allow-by-default in rustc.
Expand Down