From d3b4f28e32114999b4b7d635cf2c0f8d317b9b3c Mon Sep 17 00:00:00 2001 From: Frostebite Date: Sun, 14 May 2023 17:40:30 +0100 Subject: [PATCH] log file path --- dist/index.js | Bin 19459837 -> 19460223 bytes dist/index.js.map | Bin 13758810 -> 13759248 bytes src/model/cloud-runner/remote-client/index.ts | 22 ++++++++++++++++-- .../workflows/build-automation-workflow.ts | 15 +----------- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/dist/index.js b/dist/index.js index 373259f6243417afe2a1a9f40d8f4a940577b7fc..18831b28750cb5ed785aa96238d5e18ac229938b 100644 GIT binary patch delta 1462 zcmYk+WmFVV7=YokJG(4P$VwPsAlN8&D+acxD`I!7ilVCmc8j87qmEtJ-76M$x7dN5 zh>EQsz90Ny&UxN*X70K7e!nLDahx&ZX`FFFlxClHc%o`Osngp9TLxMqEUHH5?WT4% zD!#V(L~T=z>(I>4fnlMRK@s&LL&JI(SItJHjLK?hoB5;SsZoQTE6!?0lGe|*DMblZ zVl_KG=0_Xcvu!k6!?QN4yZ>ox*@Et9E&ir(OGM=0tXngWk3C|oubOp=quNcUv^Hhi zo_TNVQEQ+qJE^XErG_c{TynfEM6aa1QC+4O4C;^+rIebStoS(el!+a@dF0(UIv`bn z4tm(Z0DBnW07p2%89Cqr6LP{8Zg7VOav?YJATK=Og?z}50w@S?6oL6PCTNOg z2tsqTKueg>3c+ZN5VS#Cv_pGzKu2^!XLLbVbVGOaKu`2SZ&=U=ebEo0=#K#i!$1sz z6@xJZLlKS$L}D0*V+2NG6h>nV#$p`CV*(~(5+)-GQ!o|Ln1<9n%*8y+ zM=Ta#Ar?W!Vl2T@EW>iFz)GybYOKLp#9OqNiIol pNghdFiKoO%l24LfQb1Br;w>p8@sapS3QLMeifR)0OK1|({sTW*+L8bO delta 1361 zcmZwHS6qz&7{~F?Id63uB5BF!knEAYS6L+_dxglX4k>$!5JGtE6+*T+89B1|jF6E% zvX8Cg_uRO0@%>%>FP^I>KReMT??Ix?)EG^Qc1(t2WOPJOXt*IN)HiHsXhf91Aw(UK zr}Z|bW@!C2x8#2ACBuqcKz4N3pQg>-B2zN5xGIGb`m{O=blau!I$Ku!aq6VTS^+M?n;V z0}8_tMc@QyxWE-|C<=EJLvfTqNq9hyQYZ~ilz|t@LT)OL3aE%msEjJ8ifZsib<{vj z)Ix34L0!~CeKbHrG(uxEK~pqCbNIj)EzlCJ&>C&v2Y<9h0NSBFIv@}o5rj_Yj4tSk zZs?94=!stFjXnrQU-UzNgkS&$A{2u#7(*}=!!R6S2uB1A7=e+9#3)1|8ly1=V=)fn zF#!`X36n7eQ!x$GF#|D}iCKunY|O!2#9vcx3ahaO zYq1XNu>l*Ah)vjxEl9#vY{PaWV+VF(7j|P0_F^CQBLxR=5Jsfp5Dw!Ajv@`mV8U^v z;{;CP6i(v|&f*--;{q#}E9(FZ@O>^6&@waVE1S9uloYkyuD9 zB~}uh#9Cq_v6a|K3P|iF1tosK-jfPh)3I;a%3kRtYql&0aq2{cY$1e*v^<0qkzIth ztXUFSyY1>QhAZR3xM3!~hhZ8QpLw47|9{Va{_`}yZ*V>IvB9p9IQ4Rp}M1+H*I zTe!mmGCa`^?coIl9pDWgbc8Sb;Ezr)z=+P8!=^S%BI}32#eKRp*`98Vv?Yn4Sphzx zF3%XOwWO$tlIPmL9cxOu@cLlz6XtL=NYLyr%HA1VHFJ^4D2dng#&+UMt{NyD^Hf>O zEjHP8QlePgqy{RjM_BA>zsLBBtP<6%T}V}1!jv>?dPeHM6|5_;xHZYn1Pv?h1r;cxk$h~%*O&O#3CeO zF_vH{od09Ra;(5gBw-a+!-iy}z>ZX`!CIst9T`}M_1J(+Y{VvP#ujWv7PetKb|4!& zu?xGAgFV=beaOXr96%lp;t=w27zHRq5sD#j1V>SVV>pfzD8)&Xp&X}h8WlK$v#7*5 zoW})R#3fwD6SN}WU(}cP5zTV8Kv#PQ$`|xT6@@L+q2fQq+}8AN})nu z>`fufe-Se{a?x?k_r{gaIj?g*=X1_y%O9gh8?-7Mk;Ibzxd-GBX_LOB%!4O-X4nn@{Rf<=Oo5LQ`hm_C-^x!lA86L$Q8E@=wF~ z|Nq1Ozp9(V?BS&4zfaNO4V!Bepor{ifj z1MBc~JOk_TOgszE#s+M}b8se}i|66_cmZCB7vaTt30{h`@G`s{ufQvDHeQ8Icr{*w zb8s$Ri}SDM+E@K(GH7vt@C2i}Qy;Sy}arPz)+ zyc_Sq4(!A(ycfH%2YWG(eYgz!aXA)n09W9BxDxNjRk#`-z%}?F4&qvT2p`6E_y|6V z;CkGE8}TvRgq!hkd;*`uEw~l8;ZyiDK7-pa;IsG~K955vzJM>{4%~?^;mi06?!s4b zHxA=#_&UCUZ{l0{Hok-J;vRet-^ac90e*=4u!tYw$M^|;il5#-6hP diff --git a/src/model/cloud-runner/remote-client/index.ts b/src/model/cloud-runner/remote-client/index.ts index c949cb31..ee0a1f43 100644 --- a/src/model/cloud-runner/remote-client/index.ts +++ b/src/model/cloud-runner/remote-client/index.ts @@ -15,7 +15,7 @@ import BuildParameters from '../../build-parameters'; export class RemoteClient { @CliFunction(`remote-cli-pre-build`, `sets up a repository, usually before a game-ci build`) - static async runRemoteClientJob() { + static async setupRemoteClient() { CloudRunnerLogger.log(`bootstrap game ci cloud runner...`); if (!(await RemoteClient.handleRetainedWorkspace())) { await RemoteClient.bootstrapRepository(); @@ -23,9 +23,27 @@ 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 PostCLIBuild(): Promise { + public static async remoteClientPostBuild(): Promise { RemoteClientLogger.log(`Running POST build tasks`); await Caching.PushToCache( diff --git a/src/model/cloud-runner/workflows/build-automation-workflow.ts b/src/model/cloud-runner/workflows/build-automation-workflow.ts index 2f7cbb09..8a41d018 100644 --- a/src/model/cloud-runner/workflows/build-automation-workflow.ts +++ b/src/model/cloud-runner/workflows/build-automation-workflow.ts @@ -97,21 +97,8 @@ 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" - /entrypoint.sh - echo "game ci caching results" - chmod +x ${builderPath} + node ${builderPath} -m remote-cli-build node ${builderPath} -m remote-cli-post-build`; } }