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

fix

pull/531/head
Frostebite 2023-12-21 02:35:44 +00:00
parent 3592835a3e
commit 6ffa535fbf
3 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dist/index.js generated vendored
View File

@ -5924,10 +5924,7 @@ class BuildAutomationWorkflow {
static get BuildWorkflow() { static get BuildWorkflow() {
const setupHooks = command_hook_service_1.CommandHookService.getHooks(cloud_runner_1.default.buildParameters.commandHooks).filter((x) => x.step?.includes(`setup`)); const setupHooks = command_hook_service_1.CommandHookService.getHooks(cloud_runner_1.default.buildParameters.commandHooks).filter((x) => x.step?.includes(`setup`));
const buildHooks = command_hook_service_1.CommandHookService.getHooks(cloud_runner_1.default.buildParameters.commandHooks).filter((x) => x.step?.includes(`build`)); const buildHooks = command_hook_service_1.CommandHookService.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)); const builderPath = cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(node_path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute, 'dist', `index.js`));
// const builderPath = CloudRunnerFolders.ToLinuxFolder(
// path.join(CloudRunnerFolders.builderPathAbsolute, 'dist', `index.js`),
// );
return `echo "cloud runner build workflow starting" return `echo "cloud runner build workflow starting"
apt-get update > /dev/null 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 > /dev/null
@ -5951,9 +5948,8 @@ class BuildAutomationWorkflow {
const cloneBuilderCommands = `if [ -e "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute)}" ] && [ -e "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(node_path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute, `.git`))}" ] ; then echo "Builder Already Exists!" && tree ${cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute}; 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(node_path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute, `.git`))}" ] ; then echo "Builder Already Exists!" && tree ${cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute}; else ${commands} ; fi`;
return `export GIT_DISCOVERY_ACROSS_FILESYSTEM=1 return `export GIT_DISCOVERY_ACROSS_FILESYSTEM=1
${cloneBuilderCommands} ${cloneBuilderCommands}
yarn install --cwd ${builderPath}
echo "log start" >> /home/job-log.txt echo "log start" >> /home/job-log.txt
yarn run cli --cwd ${builderPath} -m remote-cli-pre-build`; node ${builderPath} -m remote-cli-pre-build`;
} }
static BuildCommands(builderPath) { static BuildCommands(builderPath) {
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');
@ -5968,8 +5964,8 @@ yarn run cli --cwd ${builderPath} -m remote-cli-pre-build`;
chmod -R +x "/steps" chmod -R +x "/steps"
echo "game ci start" echo "game ci start"
echo "game ci start" >> /home/job-log.txt echo "game ci start" >> /home/job-log.txt
/entrypoint.sh | yarn run cli --cwd ${builderPath} -m remote-cli-log-stream --logFile /home/job-log.txt /entrypoint.sh | node ${builderPath} -m remote-cli-log-stream --logFile /home/job-log.txt
yarn run cli --cwd ${builderPath} -m remote-cli-post-build`; node ${builderPath} -m remote-cli-post-build`;
} }
} }
exports.BuildAutomationWorkflow = BuildAutomationWorkflow; exports.BuildAutomationWorkflow = BuildAutomationWorkflow;

2
dist/index.js.map generated vendored
View File

File diff suppressed because one or more lines are too long

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

@ -50,12 +50,9 @@ export class BuildAutomationWorkflow implements WorkflowInterface {
const buildHooks = CommandHookService.getHooks(CloudRunner.buildParameters.commandHooks).filter((x) => const buildHooks = CommandHookService.getHooks(CloudRunner.buildParameters.commandHooks).filter((x) =>
x.step?.includes(`build`), x.step?.includes(`build`),
); );
const builderPath = CloudRunnerFolders.ToLinuxFolder(
const builderPath = CloudRunnerFolders.ToLinuxFolder(path.join(CloudRunnerFolders.builderPathAbsolute)); path.join(CloudRunnerFolders.builderPathAbsolute, 'dist', `index.js`),
);
// const builderPath = CloudRunnerFolders.ToLinuxFolder(
// path.join(CloudRunnerFolders.builderPathAbsolute, 'dist', `index.js`),
// );
return `echo "cloud runner build workflow starting" return `echo "cloud runner build workflow starting"
apt-get update > /dev/null apt-get update > /dev/null
@ -93,9 +90,8 @@ export class BuildAutomationWorkflow implements WorkflowInterface {
return `export GIT_DISCOVERY_ACROSS_FILESYSTEM=1 return `export GIT_DISCOVERY_ACROSS_FILESYSTEM=1
${cloneBuilderCommands} ${cloneBuilderCommands}
yarn install --cwd ${builderPath}
echo "log start" >> /home/job-log.txt echo "log start" >> /home/job-log.txt
yarn run cli --cwd ${builderPath} -m remote-cli-pre-build`; node ${builderPath} -m remote-cli-pre-build`;
} }
private static BuildCommands(builderPath: string) { private static BuildCommands(builderPath: string) {
@ -112,7 +108,7 @@ yarn run cli --cwd ${builderPath} -m remote-cli-pre-build`;
chmod -R +x "/steps" chmod -R +x "/steps"
echo "game ci start" echo "game ci start"
echo "game ci start" >> /home/job-log.txt echo "game ci start" >> /home/job-log.txt
/entrypoint.sh | yarn run cli --cwd ${builderPath} -m remote-cli-log-stream --logFile /home/job-log.txt /entrypoint.sh | node ${builderPath} -m remote-cli-log-stream --logFile /home/job-log.txt
yarn run cli --cwd ${builderPath} -m remote-cli-post-build`; node ${builderPath} -m remote-cli-post-build`;
} }
} }