Skip to content
This repository was archived by the owner on Aug 14, 2020. It is now read-only.

Commit c4c1668

Browse files
author
Ignacio Bonafonte
committed
Copy Scope variables properly to `swift test
1 parent ddbf5b8 commit c4c1668

File tree

2 files changed

+6
-38
lines changed

2 files changed

+6
-38
lines changed

dist/index.js

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1200,7 +1200,9 @@ async function swiftPackageRun(extraParameters, codePathEnabled, agentVersion) {
12001200
try {
12011201
await exec.exec(buildTestCommand, null, {
12021202
env: {
1203-
...envVars
1203+
...envVars,
1204+
SCOPE_COMMIT_SHA: envVars["GITHUB_SHA"],
1205+
SCOPE_SOURCE_ROOT: envVars["GITHUB_WORKSPACE"]
12041206
}
12051207
});
12061208
} catch (error) {
@@ -1490,24 +1492,6 @@ async function insertEnvVariables(file, target) {
14901492
file,
14911493
target
14921494
);
1493-
await insertEnvVariable(
1494-
"GITLAB_CI",
1495-
envVars["GITLAB_CI"] || "",
1496-
file,
1497-
target
1498-
);
1499-
await insertEnvVariable(
1500-
"CI_JOB_ID",
1501-
envVars["CI_JOB_ID"] || "",
1502-
file,
1503-
target
1504-
);
1505-
await insertEnvVariable(
1506-
"CI_JOB_URL",
1507-
envVars["CI_JOB_URL"] || "",
1508-
file,
1509-
target
1510-
);
15111495
await insertEnvVariable(
15121496
"SCOPE_SET_GLOBAL_TRACER",
15131497
envVars["SCOPE_SET_GLOBAL_TRACER"] || "",

index.js

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,9 @@ async function swiftPackageRun(extraParameters, codePathEnabled, agentVersion) {
259259
try {
260260
await exec.exec(buildTestCommand, null, {
261261
env: {
262-
...envVars
262+
...envVars,
263+
SCOPE_COMMIT_SHA: envVars["GITHUB_SHA"],
264+
SCOPE_SOURCE_ROOT: envVars["GITHUB_WORKSPACE"]
263265
}
264266
});
265267
} catch (error) {
@@ -549,24 +551,6 @@ async function insertEnvVariables(file, target) {
549551
file,
550552
target
551553
);
552-
await insertEnvVariable(
553-
"GITLAB_CI",
554-
envVars["GITLAB_CI"] || "",
555-
file,
556-
target
557-
);
558-
await insertEnvVariable(
559-
"CI_JOB_ID",
560-
envVars["CI_JOB_ID"] || "",
561-
file,
562-
target
563-
);
564-
await insertEnvVariable(
565-
"CI_JOB_URL",
566-
envVars["CI_JOB_URL"] || "",
567-
file,
568-
target
569-
);
570554
await insertEnvVariable(
571555
"SCOPE_SET_GLOBAL_TRACER",
572556
envVars["SCOPE_SET_GLOBAL_TRACER"] || "",

0 commit comments

Comments
 (0)