mirror of
https://github.com/embassy-rs/embassy.git
synced 2024-11-21 14:22:33 +00:00
Update stable to Rust 1.79.
This commit is contained in:
parent
8d79679bb2
commit
4d9115b3fb
@ -30,4 +30,3 @@ cargo batch \
|
|||||||
|
|
||||||
cargo build --release --manifest-path embassy-executor/Cargo.toml --target avr-unknown-gnu-atmega328 -Z build-std=core,alloc --features nightly,arch-avr,avr-device/atmega328p
|
cargo build --release --manifest-path embassy-executor/Cargo.toml --target avr-unknown-gnu-atmega328 -Z build-std=core,alloc --features nightly,arch-avr,avr-device/atmega328p
|
||||||
cargo build --release --manifest-path embassy-executor/Cargo.toml --target avr-unknown-gnu-atmega328 -Z build-std=core,alloc --features nightly,arch-avr,integrated-timers,avr-device/atmega328p
|
cargo build --release --manifest-path embassy-executor/Cargo.toml --target avr-unknown-gnu-atmega328 -Z build-std=core,alloc --features nightly,arch-avr,integrated-timers,avr-device/atmega328p
|
||||||
|
|
||||||
|
6
ci.sh
6
ci.sh
@ -2,6 +2,12 @@
|
|||||||
|
|
||||||
set -eo pipefail
|
set -eo pipefail
|
||||||
|
|
||||||
|
# check-cfg is stable on rustc 1.79 but not cargo 1.79.
|
||||||
|
# however, our cargo-batch is currently based on cargo 1.80, which does support check-cfg.
|
||||||
|
# so, force build.rs scripts to emit check-cfg commands.
|
||||||
|
# when 1.80 hits stable we can make build.rs unconditionally emit check-cfg and remove all this.
|
||||||
|
export EMBASSY_FORCE_CHECK_CFG=1
|
||||||
|
|
||||||
export RUSTFLAGS=-Dwarnings
|
export RUSTFLAGS=-Dwarnings
|
||||||
export DEFMT_LOG=trace,embassy_hal_internal=debug,embassy_net_esp_hosted=debug,cyw43=info,cyw43_pio=info,smoltcp=info
|
export DEFMT_LOG=trace,embassy_hal_internal=debug,embassy_net_esp_hosted=debug,cyw43=info,cyw43_pio=info,smoltcp=info
|
||||||
if [[ -z "${CARGO_TARGET_DIR}" ]]; then
|
if [[ -z "${CARGO_TARGET_DIR}" ]]; then
|
||||||
|
@ -70,6 +70,10 @@ impl CfgSet {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn is_rustc_nightly() -> bool {
|
fn is_rustc_nightly() -> bool {
|
||||||
|
if env::var_os("EMBASSY_FORCE_CHECK_CFG").is_some() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
let rustc = env::var_os("RUSTC").unwrap_or_else(|| OsString::from("rustc"));
|
let rustc = env::var_os("RUSTC").unwrap_or_else(|| OsString::from("rustc"));
|
||||||
|
|
||||||
let output = Command::new(rustc)
|
let output = Command::new(rustc)
|
||||||
|
@ -70,6 +70,10 @@ impl CfgSet {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn is_rustc_nightly() -> bool {
|
fn is_rustc_nightly() -> bool {
|
||||||
|
if env::var_os("EMBASSY_FORCE_CHECK_CFG").is_some() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
let rustc = env::var_os("RUSTC").unwrap_or_else(|| OsString::from("rustc"));
|
let rustc = env::var_os("RUSTC").unwrap_or_else(|| OsString::from("rustc"));
|
||||||
|
|
||||||
let output = Command::new(rustc)
|
let output = Command::new(rustc)
|
||||||
|
@ -70,6 +70,10 @@ impl CfgSet {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn is_rustc_nightly() -> bool {
|
fn is_rustc_nightly() -> bool {
|
||||||
|
if env::var_os("EMBASSY_FORCE_CHECK_CFG").is_some() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
let rustc = env::var_os("RUSTC").unwrap_or_else(|| OsString::from("rustc"));
|
let rustc = env::var_os("RUSTC").unwrap_or_else(|| OsString::from("rustc"));
|
||||||
|
|
||||||
let output = Command::new(rustc)
|
let output = Command::new(rustc)
|
||||||
|
@ -70,6 +70,10 @@ impl CfgSet {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn is_rustc_nightly() -> bool {
|
fn is_rustc_nightly() -> bool {
|
||||||
|
if env::var_os("EMBASSY_FORCE_CHECK_CFG").is_some() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
let rustc = env::var_os("RUSTC").unwrap_or_else(|| OsString::from("rustc"));
|
let rustc = env::var_os("RUSTC").unwrap_or_else(|| OsString::from("rustc"));
|
||||||
|
|
||||||
let output = Command::new(rustc)
|
let output = Command::new(rustc)
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
[toolchain]
|
[toolchain]
|
||||||
channel = "1.78"
|
channel = "1.79"
|
||||||
components = [ "rust-src", "rustfmt", "llvm-tools" ]
|
components = [ "rust-src", "rustfmt", "llvm-tools" ]
|
||||||
targets = [
|
targets = [
|
||||||
"thumbv7em-none-eabi",
|
"thumbv7em-none-eabi",
|
||||||
|
Loading…
Reference in New Issue
Block a user