diff --git a/dist/index.js b/dist/index.js index f74e324f..45c7e151 100644 Binary files a/dist/index.js and b/dist/index.js differ diff --git a/dist/index.js.map b/dist/index.js.map index b92b957e..b04ca063 100644 Binary files a/dist/index.js.map and b/dist/index.js.map differ diff --git a/src/model/cloud-runner/remote-client/index.ts b/src/model/cloud-runner/remote-client/index.ts index ee0a1f43..1d1e6192 100644 --- a/src/model/cloud-runner/remote-client/index.ts +++ b/src/model/cloud-runner/remote-client/index.ts @@ -23,24 +23,6 @@ export class RemoteClient { await RemoteClient.replaceLargePackageReferencesWithSharedReferences(); await RemoteClient.runCustomHookFiles(`before-build`); } - @CliFunction(`remote-cli-build`, `sets up a repository, usually before a game-ci build`) - static async remoteClientBuild() { - CloudRunnerLogger.log(`bootstrap game ci cloud runner...`); - const distFolder = path.join(CloudRunnerFolders.builderPathAbsolute, 'dist'); - const ubuntuPlatformsFolder = path.join(CloudRunnerFolders.builderPathAbsolute, 'dist', 'platforms', 'ubuntu'); - CloudRunnerSystem.Run(`mkdir -p ${`${CloudRunnerFolders.ToLinuxFolder( - CloudRunnerFolders.projectBuildFolderAbsolute, - )}/build`} - cd ${CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.projectPathAbsolute)} - cp -r "${CloudRunnerFolders.ToLinuxFolder(path.join(distFolder, 'default-build-script'))}" "/UnityBuilderAction" - cp -r "${CloudRunnerFolders.ToLinuxFolder(path.join(ubuntuPlatformsFolder, 'entrypoint.sh'))}" "/entrypoint.sh" - cp -r "${CloudRunnerFolders.ToLinuxFolder(path.join(ubuntuPlatformsFolder, 'steps'))}" "/steps" - chmod -R +x "/entrypoint.sh" - chmod -R +x "/steps" - echo "game ci start" - /entrypoint.sh - echo "game ci caching results"`); - } @CliFunction(`remote-cli-post-build`, `runs a cloud runner build`) public static async remoteClientPostBuild(): Promise { diff --git a/src/model/cloud-runner/workflows/build-automation-workflow.ts b/src/model/cloud-runner/workflows/build-automation-workflow.ts index 5fafddfb..52415f19 100644 --- a/src/model/cloud-runner/workflows/build-automation-workflow.ts +++ b/src/model/cloud-runner/workflows/build-automation-workflow.ts @@ -69,12 +69,9 @@ export class BuildAutomationWorkflow implements WorkflowInterface { export GITHUB_WORKSPACE="${CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.repoPathAbsolute)}" df -H /data/ ${BuildAutomationWorkflow.setupCommands(builderPath)} - echo "log start" > /home/job-log.txt - node ${builderPath} -m remote-cli-pre-build ${setupHooks.filter((x) => x.hook.includes(`after`)).map((x) => x.commands) || ' '} ${buildHooks.filter((x) => x.hook.includes(`before`)).map((x) => x.commands) || ' '} - node ${builderPath} -m remote-cli-build - node ${builderPath} -m remote-cli-post-build + ${BuildAutomationWorkflow.BuildCommands(builderPath)} ${buildHooks.filter((x) => x.hook.includes(`after`)).map((x) => x.commands) || ' '}`; } @@ -94,6 +91,25 @@ export class BuildAutomationWorkflow implements WorkflowInterface { }; else ${commands} ; fi`; return `export GIT_DISCOVERY_ACROSS_FILESYSTEM=1 -${cloneBuilderCommands}`; +${cloneBuilderCommands} +echo "log start" > /home/job-log.txt +node ${builderPath} -m remote-cli-pre-build`; + } + + private static BuildCommands(builderPath: string) { + const distFolder = path.join(CloudRunnerFolders.builderPathAbsolute, 'dist'); + const ubuntuPlatformsFolder = path.join(CloudRunnerFolders.builderPathAbsolute, 'dist', 'platforms', 'ubuntu'); + + return `echo "game ci cloud runner initalized" + mkdir -p ${`${CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.projectBuildFolderAbsolute)}/build`} + cd ${CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.projectPathAbsolute)} + cp -r "${CloudRunnerFolders.ToLinuxFolder(path.join(distFolder, 'default-build-script'))}" "/UnityBuilderAction" + cp -r "${CloudRunnerFolders.ToLinuxFolder(path.join(ubuntuPlatformsFolder, 'entrypoint.sh'))}" "/entrypoint.sh" + cp -r "${CloudRunnerFolders.ToLinuxFolder(path.join(ubuntuPlatformsFolder, 'steps'))}" "/steps" + chmod -R +x "/entrypoint.sh" + chmod -R +x "/steps" + echo "game ci start" > /home/job-log.txt + /entrypoint.sh > /home/job-log.txt + node ${builderPath} -m remote-cli-post-build`; } }