Skip to content

Commit

Permalink
Bump MSRV to 1.80 (#9496)
Browse files Browse the repository at this point in the history
* Bump MSRV to 1.80

This commit updates the minimum Rust version required to compile
Wasmtime to 1.80.0 from the previous 1.78.0.

* Update rust installation in CI

* Change MSRV window back to 2 now that oss-fuzz is resolved
* Update the nightly to the latest nightly

* Undo most of the nightly update
  • Loading branch information
alexcrichton authored Oct 22, 2024
1 parent 2f684ba commit a40776c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
12 changes: 2 additions & 10 deletions .github/actions/install-rust/action.yml
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
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

0 comments on commit a40776c

Please sign in to comment.