actions
/
unity-builder
mirror of https://github.com/game-ci/unity-builder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

skip included contents

pull/461/head
Frostebite 2022-09-18 07:36:28 +01:00
parent ee68632225
commit 9fb18c8d6a
3 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dist/index.js vendored
View File

@ -5232,7 +5232,20 @@ class ImageEnvironmentFactory {
{ name: 'RUNNER_WORKSPACE', value: process.env.RUNNER_WORKSPACE }, { name: 'RUNNER_WORKSPACE', value: process.env.RUNNER_WORKSPACE },
]; ];
if (parameters.cloudRunnerCluster === 'local-docker') { if (parameters.cloudRunnerCluster === 'local-docker') {
environmentVariables.push(...task_parameter_serializer_1.TaskParameterSerializer.readBuildEnvironmentVariables(parameters)); const content = [
...task_parameter_serializer_1.TaskParameterSerializer.readBuildEnvironmentVariables(parameters),
...task_parameter_serializer_1.TaskParameterSerializer.readDefaultSecrets().map((x) => {
return {
name: x.EnvironmentVariable,
value: x.ParameterValue,
};
}),
];
for (const element of content) {
if (environmentVariables.find((x) => x.name === element.name) === undefined) {
environmentVariables.push(element);
}
}
} }
if (parameters.sshAgent) if (parameters.sshAgent)
environmentVariables.push({ name: 'SSH_AUTH_SOCK', value: '/ssh-agent' }); environmentVariables.push({ name: 'SSH_AUTH_SOCK', value: '/ssh-agent' });

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

16
src/model/image-environment-factory.ts
View File

@ -68,7 +68,21 @@ class ImageEnvironmentFactory {
{ name: 'RUNNER_WORKSPACE', value: process.env.RUNNER_WORKSPACE }, { name: 'RUNNER_WORKSPACE', value: process.env.RUNNER_WORKSPACE },
]; ];
if (parameters.cloudRunnerCluster === 'local-docker') { if (parameters.cloudRunnerCluster === 'local-docker') {
environmentVariables.push(...TaskParameterSerializer.readBuildEnvironmentVariables(parameters)); const content = [
...TaskParameterSerializer.readBuildEnvironmentVariables(parameters),
...TaskParameterSerializer.readDefaultSecrets().map((x) => {
return {
name: x.EnvironmentVariable,
value: x.ParameterValue,
};
}),
];
for (const element of content) {
if (environmentVariables.find((x) => x.name === element.name) === undefined) {
environmentVariables.push(element);
}
}
} }
if (parameters.sshAgent) environmentVariables.push({ name: 'SSH_AUTH_SOCK', value: '/ssh-agent' }); if (parameters.sshAgent) environmentVariables.push({ name: 'SSH_AUTH_SOCK', value: '/ssh-agent' });