pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-13 23:21:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ci] Update rust in ci image (1.75 and 2024-01-22) (#3016)

Browse Source 
cc https://github.com/paritytech/ci_cd/issues/926

---------

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: command-bot <>
Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: Bastian Köcher <git@kchr.de>
Co-authored-by: Liam Aharon <liam.aharon@hotmail.com>
Co-authored-by: Dónal Murray <donal.murray@parity.io>
Co-authored-by: Vladimir Istyufeev <vladimir@parity.io>
This commit is contained in:
Alexander Samusev
2024-01-31 00:17:44 +01:00
committed by GitHub
parent 5a6f6d33d3
commit 5b7f24fca1
22 changed files with 116 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/contracts/fixtures/build.rs
+4 -4
View File
@@ -159,7 +159,7 @@ fn invoke_cargo_fmt<'a>(
) -> Result<()> {
// If rustfmt is not installed, skip the check.
if !Command::new("rustup")
.args(["nightly-2023-11-01", "run", "rustfmt", "--version"])
.args(["nightly-2024-01-22", "run", "rustfmt", "--version"])
.output()
.map_or(false, |o| o.status.success())
{
@@ -167,7 +167,7 @@ fn invoke_cargo_fmt<'a>(
}
let fmt_res = Command::new("rustup")
.args(["nightly-2023-11-01", "run", "rustfmt", "--check", "--config-path"])
.args(["nightly-2024-01-22", "run", "rustfmt", "--check", "--config-path"])
.arg(config_path)
.args(files)
.output()
@@ -182,7 +182,7 @@ fn invoke_cargo_fmt<'a>(
eprintln!("{}\n{}", stdout, stderr);
eprintln!(
"Fixtures files are not formatted.\n
Please run `rustup nightly-2023-11-01 run rustfmt --config-path {} {}/*.rs`",
Please run `rustup nightly-2024-01-22 run rustfmt --config-path {} {}/*.rs`",
config_path.display(),
contract_dir.display()
);
@@ -309,7 +309,7 @@ fn find_workspace_root(current_dir: &Path) -> Option<PathBuf> {
let cargo_toml_contents =
std::fs::read_to_string(current_dir.join("Cargo.toml")).ok()?;
if cargo_toml_contents.contains("[workspace]") {
return Some(current_dir)
return Some(current_dir);
}
}