dnrops
/
anki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't download nodejs if NODE_BINARY is set, add YARN_BINARY (#2446) 

* Don't download nodejs if NODE_BINARY is set

Some build environments, such as nixpkgs, restrict network access and
thus would prefer to not download anything at all. Setting PROTOC_BINARY
and friends makes the build system not download stuff, and the same
should be true for nodejs

* Allow setting YARN_BINARY for the build system

* Add myself to CONTRIBUTORS

As required by CI
This commit is contained in:
Euan Kemp 2023-03-17 20:44:46 -07:00 committed by GitHub
parent 662dbbd4ca
commit 19cf375152
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -117,6 +117,7 @@ Jack Pearson <github.com/jrpear>
yellowjello <github.com/yellowjello>
Ingemar Berg <github.com/ingemarberg>
Ben Kerman <ben@kermanic.org>
Euan Kemp <euank@euank.com>
********************

32
build/ninja_gen/src/node.rs
View File

@ -105,16 +105,6 @@ pub fn setup_node(
binary_exports: &[&'static str],
mut data_exports: HashMap<&str, Vec<Cow<str>>>,
) -> Result<()> {
download_and_extract(
build,
"node",
archive,
hashmap! {
"bin" => vec![if cfg!(windows) { "node.exe" } else { "bin/node" }],
"npm" => vec![if cfg!(windows) { "npm.cmd " } else { "bin/npm" }]
},
)?;
let node_binary = match std::env::var("NODE_BINARY") {
Ok(path) => {
assert!(
@ -124,13 +114,33 @@ pub fn setup_node(
path.into()
}
Err(_) => {
download_and_extract(
build,
"node",
archive,
hashmap! {
"bin" => vec![if cfg!(windows) { "node.exe" } else { "bin/node" }],
"npm" => vec![if cfg!(windows) { "npm.cmd " } else { "bin/npm" }]
},
)?;
inputs![":extract:node:bin"]
}
};
let node_binary = build.expand_inputs(node_binary);
build.variable("node_binary", &node_binary[0]);
build.add("yarn", YarnSetup {})?;
match std::env::var("YARN_BINARY") {
Ok(path) => {
assert!(
Utf8Path::new(&path).is_absolute(),
"YARN_BINARY must be absolute"
);
build.add_resolved_files_to_group("yarn:bin", &vec![path]);
}
Err(_) => {
build.add("yarn", YarnSetup {})?;
}
};
for binary in binary_exports {
data_exports.insert(