fix(local-docker): skip apt-get/toolchain bootstrap and remote-cli log streaming; run entrypoint directly
parent
82060437f1
commit
4c3d97dcdb
|
@ -6052,10 +6052,12 @@ class BuildAutomationWorkflow {
|
||||||
? cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(node_path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute, 'dist', `index.js`))
|
? cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(node_path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute, 'dist', `index.js`))
|
||||||
: cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(node_path_1.default.join(process.cwd(), 'dist', `index.js`));
|
: cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(node_path_1.default.join(process.cwd(), 'dist', `index.js`));
|
||||||
return `echo "cloud runner build workflow starting"
|
return `echo "cloud runner build workflow starting"
|
||||||
${isContainerized ? 'apt-get update > /dev/null' : '# skipping apt-get in non-container provider'}
|
${isContainerized && cloud_runner_1.default.buildParameters.providerStrategy !== 'local-docker'
|
||||||
${isContainerized
|
? 'apt-get update > /dev/null'
|
||||||
|
: '# skipping apt-get in local-docker or non-container provider'}
|
||||||
|
${isContainerized && cloud_runner_1.default.buildParameters.providerStrategy !== 'local-docker'
|
||||||
? 'apt-get install -y curl tar tree npm git-lfs jq git > /dev/null\n npm --version\n npm i -g n > /dev/null\n npm i -g semver > /dev/null\n npm install --global yarn > /dev/null\n n 20.8.0\n node --version'
|
? 'apt-get install -y curl tar tree npm git-lfs jq git > /dev/null\n npm --version\n npm i -g n > /dev/null\n npm i -g semver > /dev/null\n npm install --global yarn > /dev/null\n n 20.8.0\n node --version'
|
||||||
: '# skipping toolchain setup in non-container provider'}
|
: '# skipping toolchain setup in local-docker or non-container provider'}
|
||||||
${setupHooks.filter((x) => x.hook.includes(`before`)).map((x) => x.commands) || ' '}
|
${setupHooks.filter((x) => x.hook.includes(`before`)).map((x) => x.commands) || ' '}
|
||||||
export GITHUB_WORKSPACE="${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.repoPathAbsolute)}"
|
export GITHUB_WORKSPACE="${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.repoPathAbsolute)}"
|
||||||
${isContainerized ? 'df -H /data/' : '# skipping df on /data in non-container provider'}
|
${isContainerized ? 'df -H /data/' : '# skipping df on /data in non-container provider'}
|
||||||
|
@ -6074,7 +6076,9 @@ class BuildAutomationWorkflow {
|
||||||
${cloneBuilderCommands}
|
${cloneBuilderCommands}
|
||||||
echo "log start" >> /home/job-log.txt
|
echo "log start" >> /home/job-log.txt
|
||||||
echo "CACHE_KEY=$CACHE_KEY"
|
echo "CACHE_KEY=$CACHE_KEY"
|
||||||
node ${builderPath} -m remote-cli-pre-build`;
|
${cloud_runner_1.default.buildParameters.providerStrategy !== 'local-docker'
|
||||||
|
? `node ${builderPath} -m remote-cli-pre-build`
|
||||||
|
: `# skipping remote-cli-pre-build in local-docker`}`;
|
||||||
}
|
}
|
||||||
return `export GIT_DISCOVERY_ACROSS_FILESYSTEM=1
|
return `export GIT_DISCOVERY_ACROSS_FILESYSTEM=1
|
||||||
mkdir -p "$(dirname "$LOG_FILE")"
|
mkdir -p "$(dirname "$LOG_FILE")"
|
||||||
|
@ -6085,6 +6089,18 @@ echo "CACHE_KEY=$CACHE_KEY"`;
|
||||||
const distFolder = node_path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute, 'dist');
|
const distFolder = node_path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute, 'dist');
|
||||||
const ubuntuPlatformsFolder = node_path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute, 'dist', 'platforms', 'ubuntu');
|
const ubuntuPlatformsFolder = node_path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute, 'dist', 'platforms', 'ubuntu');
|
||||||
if (isContainerized) {
|
if (isContainerized) {
|
||||||
|
if (cloud_runner_1.default.buildParameters.providerStrategy === 'local-docker') {
|
||||||
|
return `
|
||||||
|
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)}
|
||||||
|
cp -r "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(node_path_1.default.join(distFolder, 'default-build-script'))}" "/UnityBuilderAction"
|
||||||
|
cp -r "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(node_path_1.default.join(ubuntuPlatformsFolder, 'entrypoint.sh'))}" "/entrypoint.sh"
|
||||||
|
cp -r "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(node_path_1.default.join(ubuntuPlatformsFolder, 'steps'))}" "/steps"
|
||||||
|
chmod -R +x "/entrypoint.sh"
|
||||||
|
chmod -R +x "/steps"
|
||||||
|
echo "game ci start"; echo "game ci start" >> /home/job-log.txt; echo "CACHE_KEY=$CACHE_KEY"; if [ -n "$LOCKED_WORKSPACE" ]; then echo "Retained Workspace: true"; fi; if [ -n "$LOCKED_WORKSPACE" ] && [ -d "$GITHUB_WORKSPACE/.git" ]; then echo "Retained Workspace Already Exists!"; fi; /entrypoint.sh
|
||||||
|
echo "end of cloud runner job"`;
|
||||||
|
}
|
||||||
return `
|
return `
|
||||||
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)}
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue