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

improve locking naming

pull/524/head
Frostebite 2023-03-20 03:30:22 +00:00
parent 4c479ab4b6
commit 1efefcdcac
4 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dist/index.js vendored
View File

@ -5498,6 +5498,7 @@ const cloud_runner_system_1 = __nccwpck_require__(99393);
const cloud_runner_folders_1 = __nccwpck_require__(13527); const cloud_runner_folders_1 = __nccwpck_require__(13527);
const cloud_runner_logger_1 = __importDefault(__nccwpck_require__(22855)); const cloud_runner_logger_1 = __importDefault(__nccwpck_require__(22855));
const node_fs_1 = __importDefault(__nccwpck_require__(87561)); const node_fs_1 = __importDefault(__nccwpck_require__(87561));
const base_64_1 = __importDefault(__nccwpck_require__(85848));
class TaskParameterSerializer { class TaskParameterSerializer {
static createCloudRunnerEnvironmentVariables(buildParameters) { static createCloudRunnerEnvironmentVariables(buildParameters) {
const result = this.uniqBy([ const result = this.uniqBy([
@ -5622,7 +5623,12 @@ class TaskParameterSerializer {
const name = variable[0].replace(`CI_`, ``); const name = variable[0].replace(`CI_`, ``);
const value = `${variable[1] || ``}`; const value = `${variable[1] || ``}`;
process.env[name] = value; process.env[name] = value;
node_fs_1.default.appendFileSync(`${cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}/setEnv.sh`, `export ${name}="${value}"\n`); if (value.includes(`\n`)) {
node_fs_1.default.appendFileSync(`${cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}/setEnv.sh`, `export ${name}=\`echo '${base_64_1.default.encode(value)}' | base64 --decode \`\n`);
}
else {
node_fs_1.default.appendFileSync(`${cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}/setEnv.sh`, `export ${name}="${value}"\n`);
}
} }
} }
await cloud_runner_system_1.CloudRunnerSystem.Run(`chmod +x ${cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}/setEnv.sh`); await cloud_runner_system_1.CloudRunnerSystem.Run(`chmod +x ${cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}/setEnv.sh`);
@ -5774,7 +5780,7 @@ class BuildAutomationWorkflow {
const buildHooks = cloud_runner_custom_hooks_1.CloudRunnerCustomHooks.getHooks(cloud_runner_1.default.buildParameters.commandHooks).filter((x) => x.step?.includes(`build`)); const buildHooks = cloud_runner_custom_hooks_1.CloudRunnerCustomHooks.getHooks(cloud_runner_1.default.buildParameters.commandHooks).filter((x) => x.step?.includes(`build`));
const builderPath = cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(node_path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute, 'dist', `index.js`)); const builderPath = cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(node_path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute, 'dist', `index.js`));
return `apt-get update > /dev/null return `apt-get update > /dev/null
apt-get install -y curl tar tree npm git-lfs jq git > /dev/null apt-get install -y curl tar tree npm git-lfs jq git base64 > /dev/null
npm i -g n > /dev/null npm i -g n > /dev/null
n 16.15.1 > /dev/null n 16.15.1 > /dev/null
npm --version npm --version

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

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

@ -10,6 +10,7 @@ import { CloudRunnerSystem } from './cloud-runner-system';
import { CloudRunnerFolders } from './cloud-runner-folders'; import { CloudRunnerFolders } from './cloud-runner-folders';
import CloudRunnerLogger from './cloud-runner-logger'; import CloudRunnerLogger from './cloud-runner-logger';
import fs from 'node:fs'; import fs from 'node:fs';
import base64 from 'base-64';
export class TaskParameterSerializer { export class TaskParameterSerializer {
static readonly blockedParameterNames: Set<string> = new Set([ static readonly blockedParameterNames: Set<string> = new Set([
@ -181,10 +182,17 @@ export class TaskParameterSerializer {
const name = variable[0].replace(`CI_`, ``); const name = variable[0].replace(`CI_`, ``);
const value = `${variable[1] || ``}`; const value = `${variable[1] || ``}`;
process.env[name] = value; process.env[name] = value;
fs.appendFileSync( if (value.includes(`\n`)) {
`${CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}/setEnv.sh`, fs.appendFileSync(
`export ${name}="${value}"\n`, `${CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}/setEnv.sh`,
); `export ${name}=\`echo '${base64.encode(value)}' | base64 --decode \`\n`,
);
} else {
fs.appendFileSync(
`${CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}/setEnv.sh`,
`export ${name}="${value}"\n`,
);
}
} }
} }
await CloudRunnerSystem.Run(`chmod +x ${CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}/setEnv.sh`); await CloudRunnerSystem.Run(`chmod +x ${CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}/setEnv.sh`);

2
src/model/cloud-runner/workflows/build-automation-workflow.ts
View File

@ -60,7 +60,7 @@ export class BuildAutomationWorkflow implements WorkflowInterface {
); );
return `apt-get update > /dev/null return `apt-get update > /dev/null
apt-get install -y curl tar tree npm git-lfs jq git > /dev/null apt-get install -y curl tar tree npm git-lfs jq git base64 > /dev/null
npm i -g n > /dev/null npm i -g n > /dev/null
n 16.15.1 > /dev/null n 16.15.1 > /dev/null
npm --version npm --version