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

log contents after cache pull and fix some scenarios with duplicate secrets

pull/353/head
Frostebite 2022-04-10 15:29:51 +01:00
parent cd86d9403e
commit 7913901814
4 changed files with 40 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dist/index.js vendored
View File

@ -2615,7 +2615,10 @@ class Caching {
if (fs_1.default.existsSync(destinationFolder)) { if (fs_1.default.existsSync(destinationFolder)) {
fs_1.default.rmdirSync(destinationFolder, { recursive: true }); fs_1.default.rmdirSync(destinationFolder, { recursive: true });
} }
yield cloud_runner_system_1.CloudRunnerSystem.Run(`mv "${fullResultsFolder}/${path_1.default.basename(destinationFolder)}" "${destinationParentFolder}"`); yield cloud_runner_system_1.CloudRunnerSystem.Run(`mv "${path_1.default.join(fullResultsFolder, path_1.default.basename(destinationFolder))}" "${destinationParentFolder}"`);
yield cloud_runner_system_1.CloudRunnerSystem.Run(`du -sh ${path_1.default.join(destinationParentFolder, path_1.default.basename(destinationFolder))}`);
const contents = fs_1.default.readdirSync(path_1.default.join(destinationParentFolder, path_1.default.basename(destinationFolder)));
cloud_runner_logger_1.default.log(`There is ${contents.length} files/dir in the cache pulled contents for ${path_1.default.basename(destinationFolder)}`);
} }
else { else {
remote_client_logger_1.RemoteClientLogger.logWarning(`cache item ${cacheArtifactName} doesn't exist ${destinationFolder}`); remote_client_logger_1.RemoteClientLogger.logWarning(`cache item ${cacheArtifactName} doesn't exist ${destinationFolder}`);
@ -3361,9 +3364,10 @@ class TaskParameterSerializer {
const array = new Array(); const array = new Array();
TaskParameterSerializer.tryAddInput(array, 'UNITY_SERIAL'); TaskParameterSerializer.tryAddInput(array, 'UNITY_SERIAL');
TaskParameterSerializer.tryAddInput(array, 'UNITY_EMAIL'); TaskParameterSerializer.tryAddInput(array, 'UNITY_EMAIL');
TaskParameterSerializer.tryAddInput(array, 'UNITY_EMAIL', 'UNITY_USERNAME');
TaskParameterSerializer.tryAddInput(array, 'UNITY_PASSWORD'); TaskParameterSerializer.tryAddInput(array, 'UNITY_PASSWORD');
array.push(...image_environment_factory_1.default.getEnvironmentVariables(__1.CloudRunner.buildParameters).map((x) => { array.push(...image_environment_factory_1.default.getEnvironmentVariables(__1.CloudRunner.buildParameters)
.filter((x) => array.find((y) => y.ParameterKey !== x.name))
.map((x) => {
return { return {
ParameterKey: x.name, ParameterKey: x.name,
EnvironmentVariable: x.name, EnvironmentVariable: x.name,
@ -3378,22 +3382,14 @@ class TaskParameterSerializer {
? cloud_runner_query_override_1.default.queryOverrides[key] ? cloud_runner_query_override_1.default.queryOverrides[key]
: process.env[key]; : process.env[key];
} }
static tryAddInput(array, key, override = '') { static tryAddInput(array, key) {
if (TaskParameterSerializer.getValue(key) !== undefined) { const value = TaskParameterSerializer.getValue(key);
if (override !== '') { if (value !== undefined && value !== '') {
array.push({ array.push({
ParameterKey: override, ParameterKey: key,
EnvironmentVariable: override, EnvironmentVariable: key,
ParameterValue: TaskParameterSerializer.getValue(key), ParameterValue: value,
}); });
}
else {
array.push({
ParameterKey: key,
EnvironmentVariable: key,
ParameterValue: TaskParameterSerializer.getValue(key),
});
}
} }
return array; return array;
} }

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

7
src/model/cloud-runner/remote-client/caching.ts
View File

@ -134,7 +134,12 @@ export class Caching {
fs.rmdirSync(destinationFolder, { recursive: true }); fs.rmdirSync(destinationFolder, { recursive: true });
} }
await CloudRunnerSystem.Run( await CloudRunnerSystem.Run(
`mv "${fullResultsFolder}/${path.basename(destinationFolder)}" "${destinationParentFolder}"`, `mv "${path.join(fullResultsFolder, path.basename(destinationFolder))}" "${destinationParentFolder}"`,
);
await CloudRunnerSystem.Run(`du -sh ${path.join(destinationParentFolder, path.basename(destinationFolder))}`);
const contents = fs.readdirSync(path.join(destinationParentFolder, path.basename(destinationFolder)));
CloudRunnerLogger.log(
`There is ${contents.length} files/dir in the cache pulled contents for ${path.basename(destinationFolder)}`,
); );
} else { } else {
RemoteClientLogger.logWarning(`cache item ${cacheArtifactName} doesn't exist ${destinationFolder}`); RemoteClientLogger.logWarning(`cache item ${cacheArtifactName} doesn't exist ${destinationFolder}`);

41
src/model/cloud-runner/services/task-parameter-serializer.ts
View File

@ -74,16 +74,17 @@ export class TaskParameterSerializer {
const array = new Array(); const array = new Array();
TaskParameterSerializer.tryAddInput(array, 'UNITY_SERIAL'); TaskParameterSerializer.tryAddInput(array, 'UNITY_SERIAL');
TaskParameterSerializer.tryAddInput(array, 'UNITY_EMAIL'); TaskParameterSerializer.tryAddInput(array, 'UNITY_EMAIL');
TaskParameterSerializer.tryAddInput(array, 'UNITY_EMAIL', 'UNITY_USERNAME');
TaskParameterSerializer.tryAddInput(array, 'UNITY_PASSWORD'); TaskParameterSerializer.tryAddInput(array, 'UNITY_PASSWORD');
array.push( array.push(
...ImageEnvironmentFactory.getEnvironmentVariables(CloudRunner.buildParameters).map((x) => { ...ImageEnvironmentFactory.getEnvironmentVariables(CloudRunner.buildParameters)
return { .filter((x) => array.find((y) => y.ParameterKey !== x.name))
ParameterKey: x.name, .map((x) => {
EnvironmentVariable: x.name, return {
ParameterValue: x.value, ParameterKey: x.name,
}; EnvironmentVariable: x.name,
}), ParameterValue: x.value,
};
}),
); );
return array; return array;
} }
@ -93,21 +94,15 @@ export class TaskParameterSerializer {
? CloudRunnerQueryOverride.queryOverrides[key] ? CloudRunnerQueryOverride.queryOverrides[key]
: process.env[key]; : process.env[key];
} }
private static tryAddInput(array, key, override = ''): CloudRunnerSecret[] { s;
if (TaskParameterSerializer.getValue(key) !== undefined) { private static tryAddInput(array, key): CloudRunnerSecret[] {
if (override !== '') { const value = TaskParameterSerializer.getValue(key);
array.push({ if (value !== undefined && value !== '') {
ParameterKey: override, array.push({
EnvironmentVariable: override, ParameterKey: key,
ParameterValue: TaskParameterSerializer.getValue(key), EnvironmentVariable: key,
}); ParameterValue: value,
} else { });
array.push({
ParameterKey: key,
EnvironmentVariable: key,
ParameterValue: TaskParameterSerializer.getValue(key),
});
}
} }
return array; return array;
} }