Skip to content

Commit d58c3d6

Browse files
committed
ci: add reusable cloud-runner-integrity workflow; wire into Integrity; disable legacy pipeline triggers
1 parent d800b10 commit d58c3d6

File tree

3 files changed

+12
-23
lines changed

3 files changed

+12
-23
lines changed

dist/index.js

Lines changed: 6 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/model/image-environment-factory.ts

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -82,17 +82,11 @@ class ImageEnvironmentFactory {
8282
{ name: 'RUNNER_TEMP', value: process.env.RUNNER_TEMP },
8383
{ name: 'RUNNER_WORKSPACE', value: process.env.RUNNER_WORKSPACE },
8484
];
85-
if (parameters.providerStrategy === 'local-docker') {
86-
for (const element of additionalVariables) {
87-
if (!environmentVariables.some((x) => element?.name === x?.name)) {
88-
environmentVariables.push(element);
89-
}
90-
}
91-
for (const variable of environmentVariables) {
92-
if (!environmentVariables.some((x) => variable?.name === x?.name)) {
93-
environmentVariables = environmentVariables.filter((x) => x !== variable);
94-
}
95-
}
85+
// Always merge additional variables (e.g., secrets/env from Cloud Runner) uniquely by name
86+
for (const element of additionalVariables) {
87+
if (!element || !element.name) continue;
88+
environmentVariables = environmentVariables.filter((x) => x?.name !== element.name);
89+
environmentVariables.push(element);
9690
}
9791
if (parameters.sshAgent) {
9892
environmentVariables.push({ name: 'SSH_AUTH_SOCK', value: '/ssh-agent' });

0 commit comments

Comments
 (0)