ci: Upgrade nightly toolchain

This commit is contained in:
Jonas Platte 2023-11-08 17:23:32 +01:00
parent 37c93d57e5
commit db06702a0f
No known key found for this signature in database
GPG key ID: AAA7A61F696C3E0C
10 changed files with 39 additions and 4 deletions

View file

@ -4,7 +4,7 @@ env:
CARGO_TERM_COLOR: always
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
# Keep in sync with version in `rust-toolchain.toml` and `xtask/src/ci.rs`
NIGHTLY: nightly-2023-07-03
NIGHTLY: nightly-2023-11-08
on:
push:

View file

@ -0,0 +1,6 @@
fn main() {
// Prevent unnecessary rerunning of this build script
println!("cargo:rerun-if-changed=build.rs");
// Prevent nightly CI from erroring on docsrs attributes
println!("cargo:rustc-check-cfg=cfg(docsrs)");
}

View file

@ -1,6 +1,11 @@
use std::{env, process};
fn main() {
// Prevent unnecessary rerunning of this build script
println!("cargo:rerun-if-changed=build.rs");
// Prevent nightly CI from erroring on docsrs attributes
println!("cargo:rustc-check-cfg=cfg(docsrs)");
let tls_features = [
("tls-native", env::var_os("CARGO_FEATURE_TLS_NATIVE").is_some()),
("tls-rustls-native-roots", env::var_os("CARGO_FEATURE_TLS_RUSTLS_NATIVE_ROOTS").is_some()),

View file

@ -0,0 +1,6 @@
fn main() {
// Prevent unnecessary rerunning of this build script
println!("cargo:rerun-if-changed=build.rs");
// Prevent nightly CI from erroring on docsrs attributes
println!("cargo:rustc-check-cfg=cfg(docsrs)");
}

View file

@ -0,0 +1,6 @@
fn main() {
// Prevent unnecessary rerunning of this build script
println!("cargo:rerun-if-changed=build.rs");
// Prevent nightly CI from erroring on docsrs attributes
println!("cargo:rustc-check-cfg=cfg(docsrs)");
}

View file

@ -0,0 +1,6 @@
fn main() {
// Prevent unnecessary rerunning of this build script
println!("cargo:rerun-if-changed=build.rs");
// Prevent nightly CI from erroring on docsrs attributes
println!("cargo:rustc-check-cfg=cfg(docsrs)");
}

6
crates/ruma/build.rs Normal file
View file

@ -0,0 +1,6 @@
fn main() {
// Prevent unnecessary rerunning of this build script
println!("cargo:rerun-if-changed=build.rs");
// Prevent nightly CI from erroring on docsrs attributes
println!("cargo:rustc-check-cfg=cfg(docsrs)");
}

View file

@ -1,4 +1,4 @@
[toolchain]
# Keep in sync with version in `xtask/src/ci.rs` and `.github/workflows/ci.yml`
channel = "nightly-2023-07-03"
channel = "nightly-2023-11-08"
components = ["rustfmt", "clippy"]

View file

@ -226,7 +226,7 @@ impl CiTask {
///
/// Also checks that all features that are used in the code exist.
fn nightly_all(&self) -> Result<()> {
cmd!("rustup run {NIGHTLY} cargo check --workspace --all-features -Z unstable-options -Z check-cfg=features")
cmd!("rustup run {NIGHTLY} cargo check --workspace --all-features -Z unstable-options -Z check-cfg")
.env("RUSTFLAGS", "-D warnings")
.run()
.map_err(Into::into)

View file

@ -15,7 +15,7 @@ use serde::Deserialize;
use serde_json::from_str as from_json_str;
// Keep in sync with version in `rust-toolchain.toml` and `.github/workflows/ci.yml`
const NIGHTLY: &str = "nightly-2023-07-03";
const NIGHTLY: &str = "nightly-2023-11-08";
#[cfg(feature = "default")]
mod cargo;