From 8e5ccae56c84234b0bbd3a25cf47c81c074694c4 Mon Sep 17 00:00:00 2001 From: Frostebite Date: Sun, 14 May 2023 21:46:09 +0100 Subject: [PATCH] log file path --- dist/index.js | Bin 19460083 -> 19459837 bytes dist/index.js.map | Bin 13759077 -> 13758797 bytes src/model/cloud-runner/remote-client/index.ts | 18 ------------ .../workflows/build-automation-workflow.ts | 26 ++++++++++++++---- 4 files changed, 21 insertions(+), 23 deletions(-) diff --git a/dist/index.js b/dist/index.js index f74e324f0911c0d154fd5eec0b93e4a89bbc79d9..45c7e151b5bfded766bbdde0c4f8e4be9f616c79 100644 GIT binary patch delta 1413 zcmXBUWmJ;^6oBEgeSk6*3q@4)BW-3k*xlWMFkw12oSR+P-TK*u-95Xz6T3TxF}vS; zyyraculwWvx}FCqzQ6CK_zoMX+phOZbyd2fHyB-C3`n%7&UsCL1vjMIk=)S7yf z0H4U}PO~LWE9h2&T)WbgQC>QOR?Dq~Ye{aU$c)Ru{@(u=!rmznu0E-He_biN$>FqH z)vl)41e+QXACqWOW6f%;#paAt?M|!JWLM2rvm?f09$<ah1uvYD-p$leKRv}#PSC7O&qY~6}kZ1Itfeh!0{oTd~X6Xj9h1#kEu9n!-W24p}+ zWP%?uBMY)38?wV6Igk?p$b~@UMjqrv5b_~ER0Jagp$J1bB2WMYQ3!=m1VvE{kuXB; zE`gFLh0-X4vM7i0sDO&7gvy9QG^(H~s-Ze+peAaeHtL`*>Y+XwpdlKeF`A$$nxQ#b zpe0(NHQJyp+Mzu)aV-40~9oAz5HewStV+*!o8@6KycEW{S*o{5di+$LS z12~97IE*7WieosA6F7-eIE^zni*q=S3%H0&xQr{fifg!zRNTN#+`?_#!ClW5#{@u=lOh}XXcsbo&V-eb(!VL=`zdo*{01# zM5T_ZG@`WIqEhs>BSxCvS*sFEx_p=l*P|;8tDd^o2-Cf)j5M85V|3EhH&n2$t1@Ez zJua%{Mu$)?&tbK@to9sxt}EYZ^*Ra)-M#`_ ziD`Z8;-X-`sx)HLwbQHyM|vH39-kxA?P6B%LYI4N$u3W(KRiecKdVn&P^tRTWo6d! z0hJo!b)=1v8#?=(D%XhtWed5#=V2WeP#OL~HEO=ul�_$%rn>3MiNngn9@@2rLLi z80sS&5omyhh(r`*Mhs%n2ytkPcqAYZO^}49Xa*~iVM7X?_&j4;sbn$Qj}p8R^ualj8E_>KEoQU#X5YB_1J(fuo0WE8C$Rwer&^b z?7&WxV;6R#0(3I`*8r@;yWC~Asoi{_yIrSC;W_Ga0EwDiCpfz zIEiYU!fBkrZ#awJ@dy6IUpR*v{EdHb9v4uHe{m6)a2Wwy!Bt$tb^M1LxQSc1jXK=H z|F~P66)-J;#E>Y7SrR0vCkd8>NGy_2NtmR*BwP|9X&`ARiIhZ1q9rksSV<#EoTRZN lUXmb5lr)hfNt#NUNvx7&iA|CsX)Z~Xv@lihOPEUQ?g5LL_O$>2 diff --git a/dist/index.js.map b/dist/index.js.map index b92b957e81b5f69ab932bfa85e7edcdbeb8e2c38..b04ca063cba4f409ac4f8bd6d0250be6d0207e12 100644 GIT binary patch delta 1137 zcmXxec~H!87{~G1Zfz=**!Gt#Rz)h5GbHy>igGTxRyNzOwe6yi6mnDB_C@Y1_s!3( zT)7he`(qjYHD*l4UwCgbo|)IoGoR;qW}a_f+kD!;wE0~7ndJzsQH#hwL9O+{{x=i+ zJXIo9AEH(QeyQ~;ca)o>4-vY`&~))B)GMhjQx+}F0c!EC%KxByTv-{Ws>`gVbtIO> zIb7!C8kf1&Wmdrhp74SPZ#p;oo@LEfggb4J54v~mLe++;g0}+iF#9|NzBMw6lj|3!QD28D;l8}rM7>Q9B zjWHOD6pX`oOh76oA`O!;8B;J7(=Z(~FcY&d8|lcv9AqL3b1@Iu$iaLpz(Op-Vl06H zOR)^gk&8U!qX304Vg-t@5+)R570f7sj8a&z8dj9S20PYZE!LqN6_;8y;XnhNXoSE49K<0s;V_QiD30McPT(X?;WW8@6w4@J#R>G&f(s`V!M*oDtqT!R3$;QO3ZaE*nMF}UxLO&pR}Pm%j4>iu6k6p-#kEf!sTz`E)3ahMw!Bzu>=+@MLIHI#WE~MCbD2dHgaG`E*!{1K2~5Q zR>6tYScA1#hXNF$2MY$LpkS9py#s8^EQ4Zjlq0w2~D761SM 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`; } }