Skip to content

Commit

Permalink
Bump the MSRV further to Rust 1.60
Browse files Browse the repository at this point in the history
Compiling the windows-sys package says:

    package `windows-sys v0.59.0` cannot be built because it requires rustc 1.60 or newer, while the currently active rustc version is 1.56.1

Oh well, if we're bumping the MSRV anyway ...
  • Loading branch information
ruuda committed Oct 22, 2024
1 parent 4b51057 commit e39314b
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
8 changes: 4 additions & 4 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"build_script": ["cargo build"],
"environment": {
"matrix": [
{"target": "1.56.1-x86_64-pc-windows-msvc"},
{"target": "1.56.1-i686-pc-windows-msvc"},
{"target": "1.69.0-x86_64-pc-windows-msvc"},
{"target": "1.69.0-i686-pc-windows-msvc"},
{"target": "1.60.0-x86_64-pc-windows-msvc"},
{"target": "1.60.0-i686-pc-windows-msvc"},
{"target": "1.70.0-x86_64-pc-windows-msvc"},
{"target": "1.70.0-i686-pc-windows-msvc"},
{"target": "beta-x86_64-pc-windows-msvc"},
{"target": "beta-i686-pc-windows-msvc"},
{"target": "nightly-x86_64-pc-windows-msvc"},
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,39 @@
{
"env": {"CARGO_TERM_COLOR": "always"},
"jobs": {
"native-1-56-1": {
"native-1-60-0": {
"runs-on": "ubuntu-latest",
"steps": [
{"uses": "actions/[email protected]"},
{
"name": "Install toolchain",
"run": "rustup toolchain install 1.56.1\nrustup target add x86_64-unknown-linux-gnu --toolchain 1.56.1\n"
"run": "rustup toolchain install 1.60.0\nrustup target add x86_64-unknown-linux-gnu --toolchain 1.60.0\n"
},
{
"name": "Build",
"run": "cargo +1.56.1 build --target x86_64-unknown-linux-gnu --verbose"
"run": "cargo +1.60.0 build --target x86_64-unknown-linux-gnu --verbose"
},
{
"name": "Run tests",
"run": "cargo +1.56.1 test --target x86_64-unknown-linux-gnu --verbose"
"run": "cargo +1.60.0 test --target x86_64-unknown-linux-gnu --verbose"
}
]
},
"native-1-69-0": {
"native-1-70-0": {
"runs-on": "ubuntu-latest",
"steps": [
{"uses": "actions/[email protected]"},
{
"name": "Install toolchain",
"run": "rustup toolchain install 1.69.0\nrustup target add x86_64-unknown-linux-gnu --toolchain 1.69.0\n"
"run": "rustup toolchain install 1.70.0\nrustup target add x86_64-unknown-linux-gnu --toolchain 1.70.0\n"
},
{
"name": "Build",
"run": "cargo +1.69.0 build --target x86_64-unknown-linux-gnu --verbose"
"run": "cargo +1.70.0 build --target x86_64-unknown-linux-gnu --verbose"
},
{
"name": "Run tests",
"run": "cargo +1.69.0 test --target x86_64-unknown-linux-gnu --verbose"
"run": "cargo +1.70.0 test --target x86_64-unknown-linux-gnu --verbose"
}
]
},
Expand Down Expand Up @@ -80,11 +80,11 @@
{"uses": "actions/[email protected]"},
{
"name": "Install toolchain",
"run": "rustup toolchain install 1.56.1\nrustup target add x86_64-fortanix-unknown-sgx --toolchain 1.56.1\n"
"run": "rustup toolchain install 1.60.0\nrustup target add x86_64-fortanix-unknown-sgx --toolchain 1.60.0\n"
},
{
"name": "Build",
"run": "cargo +1.56.1 build --target x86_64-fortanix-unknown-sgx --verbose"
"run": "cargo +1.60.0 build --target x86_64-fortanix-unknown-sgx --verbose"
}
]
},
Expand All @@ -94,11 +94,11 @@
{"uses": "actions/[email protected]"},
{
"name": "Install toolchain",
"run": "rustup toolchain install 1.56.1\nrustup target add wasm32-unknown-unknown --toolchain 1.56.1\n"
"run": "rustup toolchain install 1.60.0\nrustup target add wasm32-unknown-unknown --toolchain 1.60.0\n"
},
{
"name": "Build",
"run": "cargo +1.56.1 build --target wasm32-unknown-unknown --verbose"
"run": "cargo +1.60.0 build --target wasm32-unknown-unknown --verbose"
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions build.rcl
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
// Rebuild the files by running `rcl build`.

// The minimum supported Rust version (MSRV).
let msrv = "1.56.1";
let msrv = "1.60.0";

// All of the Rust versions that we want to test on CI.
// We pick the MSRV, beta and nightly, and one version somewhat in between.
let rust_versions = [msrv, "1.69.0", "beta", "nightly"];
let rust_versions = [msrv, "1.70.0", "beta", "nightly"];

let banner = "# This file is generated from build.rcl.";

Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# This file is generated from build.rcl.
[toolchain]
channel = "1.56.1"
channel = "1.60.0"

0 comments on commit e39314b

Please sign in to comment.