Skip to content

Commit f42ed78

Browse files
fix: use GITHUB_WORKSPACE env var when computing root path
1 parent 3bf0cff commit f42ed78

1 file changed

Lines changed: 21 additions & 1 deletion

File tree

src/run/run_environment/github_actions/provider.rs

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,15 @@ impl TryFrom<&Config> for GitHubActionsProvider {
9090
path.push("");
9191
path.to_string_lossy().to_string()
9292
}
93-
None => format!("/home/runner/work/{repository}/{repository}/"),
93+
None => {
94+
// Fallback to GITHUB_WORKSPACE, the default repository location when using the checkout action
95+
// https://docs.github.com/en/actions/reference/workflows-and-actions/variables
96+
if let Ok(github_workspace) = env::var("GITHUB_WORKSPACE") {
97+
format!("{github_workspace}/")
98+
} else {
99+
format!("/home/runner/work/{repository}/{repository}/")
100+
}
101+
}
94102
};
95103

96104
Ok(Self {
@@ -297,6 +305,10 @@ mod tests {
297305
("GITHUB_HEAD_REF", Some("feat/codspeed-runner")),
298306
("GITHUB_JOB", Some("log-env")),
299307
("GITHUB_REF", Some("refs/pull/22/merge")),
308+
(
309+
"GITHUB_WORKSPACE",
310+
Some("/home/runner/work/adrien-python-test/adrien-python-test"),
311+
),
300312
("GITHUB_REPOSITORY", Some("my-org/adrien-python-test")),
301313
("GITHUB_RUN_ID", Some("6957110437")),
302314
("VERSION", Some("0.1.0")),
@@ -346,6 +358,10 @@ mod tests {
346358
("GITHUB_JOB", Some("log-env")),
347359
("GITHUB_REF", Some("refs/pull/22/merge")),
348360
("GITHUB_REPOSITORY", Some("my-org/adrien-python-test")),
361+
(
362+
"GITHUB_WORKSPACE",
363+
Some("/home/runner/work/adrien-python-test/adrien-python-test"),
364+
),
349365
("GITHUB_RUN_ID", Some("6957110437")),
350366
("VERSION", Some("0.1.0")),
351367
("GH_MATRIX", Some("null")),
@@ -402,6 +418,10 @@ mod tests {
402418
("GITHUB_HEAD_REF", Some("feat/codspeed-runner")),
403419
("GITHUB_JOB", Some("log-env")),
404420
("GITHUB_REF", Some("refs/pull/22/merge")),
421+
(
422+
"GITHUB_WORKSPACE",
423+
Some("/home/runner/work/adrien-python-test/adrien-python-test"),
424+
),
405425
("GITHUB_REPOSITORY", Some("my-org/adrien-python-test")),
406426
("GITHUB_RUN_ID", Some("6957110437")),
407427
("VERSION", Some("0.1.0")),

0 commit comments

Comments
 (0)