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

cleanup

pull/437/head
Frostebite 2022-10-14 17:38:44 +01:00
parent a5497cd7c7
commit 395a2c8204
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dist/index.js vendored
View File

@ -4423,7 +4423,7 @@ class CloudRunnerCustomHooks {
const hooks = CloudRunnerCustomHooks.getHooks(buildParameters.customJobHooks).filter((x) => x.step.includes(`all`)); const hooks = CloudRunnerCustomHooks.getHooks(buildParameters.customJobHooks).filter((x) => x.step.includes(`all`));
return `echo "---" return `echo "---"
echo "start cloud runner init" echo "start cloud runner init"
${cloud_runner_options_1.default.cloudRunnerDebugEnv ? `printenv` : ``} ${cloud_runner_options_1.default.cloudRunnerDebugEnv ? `printenv` : `#`}
echo "start of cloud runner job" echo "start of cloud runner job"
${hooks.filter((x) => x.hook.includes(`before`)).map((x) => x.commands) || ' '} ${hooks.filter((x) => x.hook.includes(`before`)).map((x) => x.commands) || ' '}
${commands} ${commands}
@ -4592,7 +4592,7 @@ class CloudRunnerCustomSteps {
image: amazon/aws-cli image: amazon/aws-cli
hook: after hook: after
commands: | commands: |
${cloud_runner_options_1.default.cloudRunnerDebugEnv ? `printenv` : ``} ${cloud_runner_options_1.default.cloudRunnerDebugEnv ? `printenv` : `#`}
aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default
aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default
aws configure set region $AWS_DEFAULT_REGION --profile default aws configure set region $AWS_DEFAULT_REGION --profile default
@ -4608,7 +4608,7 @@ class CloudRunnerCustomSteps {
image: amazon/aws-cli image: amazon/aws-cli
hook: after hook: after
commands: | commands: |
${cloud_runner_options_1.default.cloudRunnerDebugEnv ? `printenv` : ``} ${cloud_runner_options_1.default.cloudRunnerDebugEnv ? `printenv` : `#`}
aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default
aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default
aws configure set region $AWS_DEFAULT_REGION --profile default aws configure set region $AWS_DEFAULT_REGION --profile default
@ -4624,7 +4624,7 @@ class CloudRunnerCustomSteps {
image: amazon/aws-cli image: amazon/aws-cli
hook: before hook: before
commands: | commands: |
${cloud_runner_options_1.default.cloudRunnerDebugEnv ? `printenv` : ``} ${cloud_runner_options_1.default.cloudRunnerDebugEnv ? `printenv` : `#`}
aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default
aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default
aws configure set region $AWS_DEFAULT_REGION --profile default aws configure set region $AWS_DEFAULT_REGION --profile default
@ -4648,7 +4648,7 @@ class CloudRunnerCustomSteps {
commands: | commands: |
apt-get update > /dev/null apt-get update > /dev/null
apt-get install -y tree > /dev/null apt-get install -y tree > /dev/null
${cloud_runner_options_1.default.cloudRunnerDebugEnv ? `printenv` : ``} ${cloud_runner_options_1.default.cloudRunnerDebugEnv ? `printenv` : `#`}
tree -L 3 /data/cache tree -L 3 /data/cache
secrets: secrets:
- name: awsAccessKeyId - name: awsAccessKeyId
@ -5528,7 +5528,7 @@ class BuildAutomationWorkflow {
const commands = `mkdir -p ${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute)} && git clone -q -b ${cloud_runner_1.default.buildParameters.cloudRunnerBranch} ${cloud_runner_folders_1.CloudRunnerFolders.unityBuilderRepoUrl} "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute)}" && chmod +x ${builderPath}`; const commands = `mkdir -p ${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute)} && git clone -q -b ${cloud_runner_1.default.buildParameters.cloudRunnerBranch} ${cloud_runner_folders_1.CloudRunnerFolders.unityBuilderRepoUrl} "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute)}" && chmod +x ${builderPath}`;
const TreeWorkspace = cloud_runner_options_1.default.cloudRunnerDebugTree const TreeWorkspace = cloud_runner_options_1.default.cloudRunnerDebugTree
? `tree -L 2 ${cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}` ? `tree -L 2 ${cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}`
: ``; : `#`;
const retainedWorkspaceCommands = `if [ -e "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute)}" ] && [ -e "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.repoPathAbsolute, `.git`))}" ]; then echo "Retained Workspace Already Exists!" && ${TreeWorkspace}; fi`; const retainedWorkspaceCommands = `if [ -e "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute)}" ] && [ -e "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.repoPathAbsolute, `.git`))}" ]; then echo "Retained Workspace Already Exists!" && ${TreeWorkspace}; fi`;
const cloneBuilderCommands = `if [ -e "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute)}" ] && [ -e "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute, `.git`))}" ]; then echo "Builder Already Exists!"; else ${commands}; fi`; const cloneBuilderCommands = `if [ -e "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute)}" ] && [ -e "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute, `.git`))}" ]; then echo "Builder Already Exists!"; else ${commands}; fi`;
return `export GIT_DISCOVERY_ACROSS_FILESYSTEM=1 return `export GIT_DISCOVERY_ACROSS_FILESYSTEM=1
@ -5546,7 +5546,7 @@ class BuildAutomationWorkflow {
const ubuntuPlatformsFolder = path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute, 'dist', 'platforms', 'ubuntu'); const ubuntuPlatformsFolder = path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute, 'dist', 'platforms', 'ubuntu');
const TreeWorkspace = cloud_runner_options_1.default.cloudRunnerDebugTree const TreeWorkspace = cloud_runner_options_1.default.cloudRunnerDebugTree
? `tree -L 2 ${cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}` ? `tree -L 2 ${cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}`
: ``; : `#`;
return `echo "game ci cloud runner init" return `echo "game ci cloud runner init"
mkdir -p ${`${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.projectBuildFolderAbsolute)}/build`} mkdir -p ${`${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.projectBuildFolderAbsolute)}/build`}
cd ${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.projectPathAbsolute)} cd ${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.projectPathAbsolute)}

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
src/model/cloud-runner/services/cloud-runner-custom-hooks.ts
View File

@ -14,7 +14,7 @@ export class CloudRunnerCustomHooks {
return `echo "---" return `echo "---"
echo "start cloud runner init" echo "start cloud runner init"
${CloudRunnerOptions.cloudRunnerDebugEnv ? `printenv` : ``} ${CloudRunnerOptions.cloudRunnerDebugEnv ? `printenv` : `#`}
echo "start of cloud runner job" echo "start of cloud runner job"
${hooks.filter((x) => x.hook.includes(`before`)).map((x) => x.commands) || ' '} ${hooks.filter((x) => x.hook.includes(`before`)).map((x) => x.commands) || ' '}
${commands} ${commands}

8
src/model/cloud-runner/services/cloud-runner-custom-steps.ts
View File

@ -38,7 +38,7 @@ export class CloudRunnerCustomSteps {
image: amazon/aws-cli image: amazon/aws-cli
hook: after hook: after
commands: | commands: |
${CloudRunnerOptions.cloudRunnerDebugEnv ? `printenv` : ``} ${CloudRunnerOptions.cloudRunnerDebugEnv ? `printenv` : `#`}
aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default
aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default
aws configure set region $AWS_DEFAULT_REGION --profile default aws configure set region $AWS_DEFAULT_REGION --profile default
@ -54,7 +54,7 @@ export class CloudRunnerCustomSteps {
image: amazon/aws-cli image: amazon/aws-cli
hook: after hook: after
commands: | commands: |
${CloudRunnerOptions.cloudRunnerDebugEnv ? `printenv` : ``} ${CloudRunnerOptions.cloudRunnerDebugEnv ? `printenv` : `#`}
aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default
aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default
aws configure set region $AWS_DEFAULT_REGION --profile default aws configure set region $AWS_DEFAULT_REGION --profile default
@ -70,7 +70,7 @@ export class CloudRunnerCustomSteps {
image: amazon/aws-cli image: amazon/aws-cli
hook: before hook: before
commands: | commands: |
${CloudRunnerOptions.cloudRunnerDebugEnv ? `printenv` : ``} ${CloudRunnerOptions.cloudRunnerDebugEnv ? `printenv` : `#`}
aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile default
aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile default
aws configure set region $AWS_DEFAULT_REGION --profile default aws configure set region $AWS_DEFAULT_REGION --profile default
@ -94,7 +94,7 @@ export class CloudRunnerCustomSteps {
commands: | commands: |
apt-get update > /dev/null apt-get update > /dev/null
apt-get install -y tree > /dev/null apt-get install -y tree > /dev/null
${CloudRunnerOptions.cloudRunnerDebugEnv ? `printenv` : ``} ${CloudRunnerOptions.cloudRunnerDebugEnv ? `printenv` : `#`}
tree -L 3 /data/cache tree -L 3 /data/cache
secrets: secrets:
- name: awsAccessKeyId - name: awsAccessKeyId

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

@ -117,7 +117,7 @@ export class BuildAutomationWorkflow implements WorkflowInterface {
const TreeWorkspace = CloudRunnerOptions.cloudRunnerDebugTree const TreeWorkspace = CloudRunnerOptions.cloudRunnerDebugTree
? `tree -L 2 ${CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}` ? `tree -L 2 ${CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}`
: ``; : `#`;
const retainedWorkspaceCommands = `if [ -e "${CloudRunnerFolders.ToLinuxFolder( const retainedWorkspaceCommands = `if [ -e "${CloudRunnerFolders.ToLinuxFolder(
CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute, CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute,
@ -148,7 +148,7 @@ export class BuildAutomationWorkflow implements WorkflowInterface {
const TreeWorkspace = CloudRunnerOptions.cloudRunnerDebugTree const TreeWorkspace = CloudRunnerOptions.cloudRunnerDebugTree
? `tree -L 2 ${CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}` ? `tree -L 2 ${CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute}`
: ``; : `#`;
return `echo "game ci cloud runner init" return `echo "game ci cloud runner init"
mkdir -p ${`${CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.projectBuildFolderAbsolute)}/build`} mkdir -p ${`${CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.projectBuildFolderAbsolute)}/build`}