From 5133a0bcd757f8c5c469aad74235195c61c41cc7 Mon Sep 17 00:00:00 2001 From: Frostebite Date: Thu, 21 Dec 2023 01:25:18 +0000 Subject: [PATCH] fix --- dist/index.js | Bin 22193955 -> 22194218 bytes dist/index.js.map | Bin 14668198 -> 14668497 bytes .../workflows/build-automation-workflow.ts | 17 +++++++++++------ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dist/index.js b/dist/index.js index a6c1edf575164aaccdfb3e731860a897713589af..004dd1296bf256561ffb39fbbd19e45531e08d2c 100644 GIT binary patch delta 1685 zcmZ|PcT|;i9LMnkJPKYmB3G1)4~PTdg18qb?k!U8#bpTBt`}mY=E#aNv$CRmoDH>Q zS`HL9+R(yMY-oEA&4w#S!+L)_{^1|>ob!60?>XP|dw$Pf&$^>^whi@lwuO~GmA;jJ z)yA1n>qvlKkTp3iFd)Rtt#Ett3re$G%cYNkO-T3<4H|rC}CSQWp}jY zj5Zv>Ic{%$!R(Y7WjTq-wq*QEM-mX}Y~-*;C7Uv4CSc69himLn1eep7xOS53vd?};%?l7dr^t|a6cB|0W8LY zSb~S}Fdo5DJc`HgII8djp2RX(SdJA~iB(vQHFye7;~6}QwOEJscn;6w1-yutumLY) zBR1g`yo$}(g00wwYHY_2)L37o`7_!ytyQ+$Tc@ddubSNIy=;9Go$@9_hE#3`J{PdJ00@e6*% zZ#au{IFAdsh~IGumvIGG@dy6IU-%o>@XwNLhtEC=HZ`ioX(|G*WCzpc146 zD7!&SeU*Mne`SC& hP#L5QR)#1;m0`+oWrQ+P8Kq9I${Ta>5GM$ORkN!VdPxjXZFG zBb?w27vzO2+~5xV<%xXoLVgrLK@@^F3Zn>$q8N&!1bk2urBE7W;0r(aqb$myJSrdn z6%mL^sEjHILRC~lFhUTD>ZpO5sD&`pMjg~eJ%pn^8lWK>p)s1EDVm`)9hGPUqViZPW z48~#{#v=x?n1DD;#3W3{6imf5OvenOCl9L&W$%!dgJun>!|7)!7e%di|Puo9~f zkJVU%wOEJs*no}Lgw5E3t=NX`*nyqch27YLy-2`5?8gBd#33BU5hUU$j^Q{?;3Q7r zG|u2G&LIisaRC>Rj7vztWu)Q?(r^{ma2+>r6Sr_1cW@W?a32rw5RdQ}Pw*7a@EkAj z60eYs*LZ`sc!&4+fRFfu&-j9`_=fMuzz_VyFZ{+I{GAfvVKxIw7A31jW{6kEkku~%{{c@zi5QE^h76&EG1;;OhQ?#lnIJT>K0yp;S(0i~c) zNbyz*D@Bx|N-?FlQbO@jN-Cw4(n=Y{SMgK)m9k1XrMyx>2~a93fl4K%vQk9}QmQJ| plwc)9300~qHI$l4EhS8;t<+KKD)p3brM}WYX=s+nK`~36^bhaT`lJ8= diff --git a/dist/index.js.map b/dist/index.js.map index 11c892a1b0084a52b73938bd7045d9d45a21be96..6346639ddfcd65dabddb7a7f67bc823f2a114bbd 100644 GIT binary patch delta 1224 zcmZ|IS4@*p7{>7+2nvD}tbz#NCvE{N?mcngpl(zgW!IJhrIjgC7j8koBe+4_16*|r z?v1#>&6O8kc;l5xBmOZa8WT?P%X!axp7)%?WsQ!t<&BONvkduaZ?WvFy^AQRw-3)( zPZZBXTwR1s?_4YzbX0kE4uzF!PdlMrqHqz}vO_?@7=?4u-@W==LzT|Hskz2x&b68C z&;s^wKub8n39Zl?&Tv5+xWWx>;SL2n;E8rnqCGmm3*P7mA9RAR)n@i<|5JR4^=sQg zr4orLl2Vj@^YIjYGbA@9CN)Xw_DB>6l2KL3-7N{yDgW=5K|`sf&= zy6HQwEGf{VX-YPl4RVxT%Uh&`&La6)W3wc?md)ITHq-aZt+Pmw(HZ{eg0AR>?&yJ@ z=!M=0Kp=w92P*VMF#4fC24EltVK9bZD28D;MqngHVKl~IEXH9xLNEanF$t3~1)-RV zX_$@~2!k3kF$=RX2XiqG^AU~(ScpZ4z+x=HQY?c8k%&SxVi1cs#6yea&_Ry`7?6l0 zB*Talm|(^Vq#_OJ$Ur8tuoBr=g&bJ08f&l?>#!cV*no}Lgw5E3t=NX`$U{DMpa6v^ z!cGY6LNQ9P8+))9`>-Dea1f;^!y%O8Fpl6Tj^Q{?;3Q7rG|r#`l{kxYIFAds2rDk( zGOpk%uHiav;3le2ja#^lJGhH`xQ_>Th(~ygCwPiysKIm8;ssvf6<*^F>QIljc!&4+ OfRFfOt+RZt3Ht>{{CF_{ delta 1031 zcmX}f_g~C$0LSsijjmMau~SD4cd{KBt!^-DiIAMe+@rlihPT3lx;Pjbk(cOW9q}FDbe-o(G;(y=%9xIM)<)5e*~Zr0uh8@G)5CNMF`AjhEOzz1uf7L ztp;%IL^QOP6^$!m7I5 zLg&};Z4G7h>OBGxh(tTIM+bC7Cv-*^M4>C95rbHCLwCfX2YR9xdZQ2eq96KW00v?Z z24e_@Vi@8v93wCiqc9p{Fc#x59yUxs0w!V-5@E+=Bw-4sVj8An29hxovoITTkb=2L z#XQW%0xU!t(y<7Ou>?!849l?sE8#!}GNE7KJw)?h8xVLdirBR0W}&B#JFwjc){ zY{fR@!izj?#}4eoF6_o0?8QFhV?TU2fP*N2#339;A&%fEj^Q{?;3Q6=2*o&!5|rW$ z&f*--;{q#}E9(FIDf+suTYMrg@mk diff --git a/src/model/cloud-runner/workflows/build-automation-workflow.ts b/src/model/cloud-runner/workflows/build-automation-workflow.ts index 94d465e8..d509e158 100644 --- a/src/model/cloud-runner/workflows/build-automation-workflow.ts +++ b/src/model/cloud-runner/workflows/build-automation-workflow.ts @@ -50,14 +50,18 @@ export class BuildAutomationWorkflow implements WorkflowInterface { const buildHooks = CommandHookService.getHooks(CloudRunner.buildParameters.commandHooks).filter((x) => x.step?.includes(`build`), ); - const builderPath = CloudRunnerFolders.ToLinuxFolder( - path.join(CloudRunnerFolders.builderPathAbsolute, 'dist', `index.js`), - ); + + const builderPath = CloudRunnerFolders.ToLinuxFolder(path.join(CloudRunnerFolders.builderPathAbsolute)); + + // const builderPath = CloudRunnerFolders.ToLinuxFolder( + // path.join(CloudRunnerFolders.builderPathAbsolute, 'dist', `index.js`), + // ); return `echo "cloud runner build workflow starting" apt-get update > /dev/null apt-get install -y curl tar tree npm git-lfs jq git > /dev/null npm i -g n > /dev/null + npm install --global yarn > /dev/null n 16.16.0 > /dev/null npm --version node --version @@ -88,8 +92,9 @@ export class BuildAutomationWorkflow implements WorkflowInterface { return `export GIT_DISCOVERY_ACROSS_FILESYSTEM=1 ${cloneBuilderCommands} +yarn install --cwd ${builderPath} echo "log start" >> /home/job-log.txt -node ${builderPath} -m remote-cli-pre-build`; +yarn run cli --cwd ${builderPath} -m remote-cli-pre-build`; } private static BuildCommands(builderPath: string) { @@ -106,7 +111,7 @@ node ${builderPath} -m remote-cli-pre-build`; chmod -R +x "/steps" echo "game ci start" echo "game ci start" >> /home/job-log.txt - /entrypoint.sh | node ${builderPath} -m remote-cli-log-stream --logFile /home/job-log.txt - node ${builderPath} -m remote-cli-post-build`; + /entrypoint.sh | yarn run cli --cwd ${builderPath} -m remote-cli-log-stream --logFile /home/job-log.txt + yarn run cli --cwd ${builderPath} -m remote-cli-post-build`; } }