Skip to content

Commit 7614592

Browse files
committed
Do not inherit environment variables in citool tests
So that we can make sure that they are reproducible locally.
1 parent 334ba81 commit 7614592

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

src/ci/citool/tests/jobs.rs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,21 @@ fn pr_jobs() {
4646
}
4747

4848
fn get_matrix(event_name: &str, commit_msg: &str, branch_ref: &str) -> String {
49-
let output = Command::new("cargo")
50-
.args(["run", "-q", "calculate-job-matrix", "--jobs-file", TEST_JOBS_YML_PATH])
49+
let path = std::env::var("PATH");
50+
let mut cmd = Command::new("cargo");
51+
cmd.args(["run", "-q", "calculate-job-matrix", "--jobs-file", TEST_JOBS_YML_PATH])
52+
.env_clear()
5153
.env("GITHUB_EVENT_NAME", event_name)
5254
.env("COMMIT_MESSAGE", commit_msg)
5355
.env("GITHUB_REF", branch_ref)
5456
.env("GITHUB_RUN_ID", "123")
5557
.env("GITHUB_RUN_ATTEMPT", "1")
56-
.stdout(Stdio::piped())
57-
.output()
58-
.expect("Failed to execute command");
58+
.stdout(Stdio::piped());
59+
if let Ok(path) = path {
60+
cmd.env("PATH", path);
61+
}
62+
63+
let output = cmd.output().expect("Failed to execute command");
5964

6065
let stdout = String::from_utf8(output.stdout).unwrap();
6166
let stderr = String::from_utf8(output.stderr).unwrap();

0 commit comments

Comments
 (0)