From 6ffa535fbf372646f4619ab7ef9dbb171c5e14a1 Mon Sep 17 00:00:00 2001 From: Frostebite Date: Thu, 21 Dec 2023 02:35:44 +0000 Subject: [PATCH] fix --- dist/index.js | Bin 22194239 -> 22194020 bytes dist/index.js.map | Bin 14668524 -> 14668275 bytes .../workflows/build-automation-workflow.ts | 16 ++++++---------- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dist/index.js b/dist/index.js index 38c86257e8836bdbf287782584f8f669e7800ec1..d123fc39a92b5a37bf16a2ab5846bab15f18372f 100644 GIT binary patch delta 1507 zcmX}sRaBHw07c;i{s;^rVU2*J7$~9`m{_QY1=wAvU^{lVVh8rv-Q8ef2P$@Vw_xVAsz|XjXl_leb|o!NW?)L!eJc2 zQ5?f@oWMz(LK05n49+4M=Wreua1obq8CP%>*Ki#-a1*z18+ULQ_i!H%@DPvi7*FsN z&+r^C@Di`^8gK9x?~sD`_<)c2gwObbulR=V_<^7Jh2QvtzZ0z%yErKJN*cvb9F(+* zqvE7ED<;K7NvF6f=@mD{UGY#nl?+NoC6kg_$)cE*tcsW7t@tR}l+;&c*UF*zDmj&0 zN^T{O;-}xwSLb!YyHpOXMfsf_LbYp_Ltix6}c6; z7kQKz7yYfh-X6Ze@$sf3FLzXdIkYgxnVFTJo>7o(Cb}w0f~=i)-TeY>=Kl{Ln&wER zuEATwtSeE5r**>Lh;om$SxFN^f=hh@jN4u@V>9w|%^dd2a5~MnILGKrGkV+uTTifM zIkNN2NN3(Kt0LU62i{+hUzlq;oH_q3C`|}8t{D#*SPUYpWV;dbh+(Z6F1rCwRDu`0 zQ5iP)z!z2E2Y&>hDgsdrL8y*kgdh}QsDYXYhaC~n|4h_IB%%w>E3`%%v_(54qCGmGBa+YwozVr!=!$MgL3gAg4L#5kz0e!! z=!3`57muSKoaB3{BIOvV&UMG>Z9I%Z%dW??qwU@qoiK8mpb3$X|;EXK=t z1s0ZIDPF~EcpY!xO}vF=SdJA~iMR0%-o+}shxhRTR$~p;;zO*%dThW)_!uSFh)pQP zW^BP$Y{Pc!z$YlfPVB;`_za(8H}>EQe2K46j=lIA-(VlU#eN*XclaJZ;2;j+Fpl6T zj^Rff#|fOoDV)Yn_!+<849?;le#LJ%j|;enOSp{RaRpaVfou2!f8sA(#|`|Ae{d7G za2t1U7yr(2+1-kvxGNrtp?E5l6febFsjS!(AH`RxqWCHPN`O*T2~?^nK}vNcSP4-= zl`y4-Qd0?6?jI;ZZ?zOtsjWmRQA)H@N2#mSQ|c=Xl!i)-605{1jg)w$v67%PQJN~v zl;%ncrKQqJX|1$T+A8goM5VpbLFuR@DV>zgN*5(r>8f;7Qk3pWs*pqpieVUz5g3V42*YTMK{z51iLn@m@tA;#n1sogf~kl?G^SxX zW?&{}VK!ng2eFuod5FV&EWkn-u?UN?1SXiV6w9z2@kqc5ti&o#+eFVM97LVKcVCjtp$YHe|wq?bv~x*o7?Y#vbfNHgd2Jx!8|99Du+<mE$-kh?%_Tj;2|F2F`nQlo}muU@dEXDiC1`yH+YM8c#jYGh)?*8FZk+o*}wgW FY6AYVNoW87 delta 1242 zcmZ|HX;92z9Ki9}b~m(JNhOKhKh_Z?_gUm7)IV}>X*;m2m9%jt(Pp$t{|=!fW$-I1e}n{!@^2w(;bYggP>21gM75_b*wxpr z53MU@n`~Ce%ubWVB87*iW~E7n1^=xV=?;BZ19xT1v`VQK^WRF8<>+;;5{F))uH`qT zmbos^kgJD;W@wHUFrXz`p*7kd6m8KCVF*WiM4$sYq7yo!3%a5kx}yhrq8EB25>e=b zzKBLY^v3`U#2^gD5DdjI#9%l^U?gG@2O04gh0#dB7>va@jK>5_#3UGzh$Ku#GE7K8 zD$#!ahun|sd!e(s2R&0a7cI-etc48NHV-NOXANJz_3UCmGIE2GEf+8Hn zF%;uCPT(X?;WW;m1ZPo-b8w*y=WziSaS4}k1?8wfC9dKcuHy!7;udb>4({R}?&AR- j;t?L>37+B^p5p~x;uT)w4c_7%-s1y4x(vCW9>x6zSQz{N diff --git a/src/model/cloud-runner/workflows/build-automation-workflow.ts b/src/model/cloud-runner/workflows/build-automation-workflow.ts index 04cc2ffd..0d603402 100644 --- a/src/model/cloud-runner/workflows/build-automation-workflow.ts +++ b/src/model/cloud-runner/workflows/build-automation-workflow.ts @@ -50,12 +50,9 @@ 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)); - - // const builderPath = CloudRunnerFolders.ToLinuxFolder( - // 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" apt-get update > /dev/null @@ -93,9 +90,8 @@ export class BuildAutomationWorkflow implements WorkflowInterface { return `export GIT_DISCOVERY_ACROSS_FILESYSTEM=1 ${cloneBuilderCommands} -yarn install --cwd ${builderPath} 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) { @@ -112,7 +108,7 @@ yarn run cli --cwd ${builderPath} -m remote-cli-pre-build`; chmod -R +x "/steps" echo "game ci start" 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 - yarn run cli --cwd ${builderPath} -m remote-cli-post-build`; + /entrypoint.sh | node ${builderPath} -m remote-cli-log-stream --logFile /home/job-log.txt + node ${builderPath} -m remote-cli-post-build`; } }