traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(xtask): properly trim emscripten version at the source (#4402)

Browse source 
* fix(xtask): properly trim emscripten version at the source

* fix(loader): trim emscripten version in `cargo:rustc-env=` print
This commit is contained in:
Will Lillis 2025-04-27 23:59:04 -04:00 • committed by GitHub
parent ca7ff033db
commit d0e0e0322c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cli/loader/build.rs
View file

@ -9,5 +9,8 @@ fn main() {
);
let emscripten_version = std::fs::read_to_string("emscripten-version").unwrap();
println!("cargo:rustc-env=EMSCRIPTEN_VERSION={emscripten_version}");
println!(
"cargo:rustc-env=EMSCRIPTEN_VERSION={}",
emscripten_version.trim()
);
}

2
xtask/src/build_wasm.rs
View file

@ -107,7 +107,7 @@ pub fn run_wasm(args: &BuildWasm) -> Result<()> {
};
// Run `emcc` in a container using the `emscripten-slim` image
command.args([EMSCRIPTEN_TAG.trim(), "emcc"]);
command.args([EMSCRIPTEN_TAG, "emcc"]);
command
}
};

5
xtask/src/main.rs
View file

@ -170,11 +170,12 @@ struct UpgradeWasmtime {
const BUILD_VERSION: &str = env!("CARGO_PKG_VERSION");
const BUILD_SHA: Option<&str> = option_env!("BUILD_SHA");
const EMSCRIPTEN_VERSION: &str = include_str!("../../cli/loader/emscripten-version");
const EMSCRIPTEN_VERSION: &str = include_str!("../../cli/loader/emscripten-version").trim_ascii();
const EMSCRIPTEN_TAG: &str = concat!(
"docker.io/emscripten/emsdk:",
include_str!("../../cli/loader/emscripten-version")
);
)
.trim_ascii();
fn main() {
let result = run();