From 41f1f8bd2983417955bc3a36af7fb62d9298d940 Mon Sep 17 00:00:00 2001 From: Frostebite Date: Sat, 9 Dec 2023 18:29:09 +0000 Subject: [PATCH] fix --- dist/index.js | Bin 22197129 -> 22193935 bytes dist/index.js.map | Bin 14671924 -> 14668178 bytes src/model/cloud-runner/cloud-runner.ts | 4 ---- .../services/hooks/container-hook-service.ts | 5 ----- .../workflows/build-automation-workflow.ts | 4 ---- 5 files changed, 13 deletions(-) diff --git a/dist/index.js b/dist/index.js index ae2683ca1a250a317fc5c66e38035dc9cd58c7ad..386a81074693d444a893cd5b0422555fb1d64fac 100644 GIT binary patch delta 1626 zcmZ|PcU0A79LMo<@9zR~L6(Am3W}oO1VM2jprWFP;4CpC)0VkP&D0z@5Es@D{HdVg zKpT!*7FW&H!osrBmXRZ~ELUh+YOeRk|NG*Hdu5%2{}{%IP|3nnQ{z zthLGEA!bckfEgPTwyUH#$-~OavU{4jMZxBTk`30J8HR^>V&h<|?5xc(&sCc5Dz(Ax zc9j~w(bl11_DVA@&)ZsFX_Q+&364bfy2D0Xj5ThQ;k2@AjC}LVc28^K=}aFh!ex(i zkG*OPvi;AgpF88a5gq#QQeF}7ZKVb}c3P{7jYRkGAjfFK^eu>Tr-wMg>`aaGt3w^| zfG50A3*KHgf{g8?N z$ie_*BL@R92!k;MLop1G;86@mE=J%njKt%}!xI>VCovjh@D!fLGk6xyVJx1x zOvEI-fEO_tQ!o`TVH#e>bj-j^yncE^k3}fJVl2T@EW>gXVg+8q z>o8G-VyuLPRalKRC_yRKVjb3_3>&Z!o3I(>*n+Ki18?Fjyp3(xjvd$u7v90U*oF7- zJ}ThGZtTHce1Lt}j{`V}L--IM;bVM)Pf>}(_za(;3P{g|G1qj^Q}I#dr7~ zKj254z)z^g&p3%wIE^#-1!wUq&fz!wj`R2ff8qiz;u0?73jRV3uHqX0#&z7lKlm3n zaSONcAMW5T?&1ED>QGxD6uV+54#h+9RJ@d0inroad=y`$w&JJwD*;NN5~S2o>MFrX zh*D2^xHn8wxKdwfpfpq>lt`tK(pZU7nkY?`Xr-CbT!~R)l@>}%rIpfJX`{4N;*@x$ zosys=D(#gHN|Mr1>7;a4x+qpm7(I@}_ delta 1980 zcmbW%X;4*V7{Kwl8_NX&WnY8?h=2m30;1r8xPmB#?VAWEHLl#-UD`|2ipUc3P=^4k zTV`ctnB{FVv@GjJW=0E@ZB~}qVp&;f^?#gc!tp~hefa(7%$)PS&w1y}oR-~wYx4oW zwR@kY&F~f%*V&zFp37b9bkB6!J&vr*8rAJ_D6S>7PPJaCv)MiMiqq5Bs5%v=>au&B zb*d{fyTqy)I?}bHTBmHHt@Ot0y?c!@`nmv1gqGMIy=8Y>iAC?Wby>7ZZ)yI({mX4? zZR3AT(3O5;tQOv}RbSC(NFV&qk~;e`hfQ^>3w5upD~g>LXw`o6s})6Vy}`i@XZ`{ms?rn zS!%0STyE7N$J93`MMUb#A=7Go&Hj*}lNJ}~$?ZJ>`kqoHL~q?>O!4hHXsR)sG9vk; z5l;30PYCn*51BIJ1|Dyl#oVpsY%J1)+f0ReL5ZbIcleDJzMMdFzfo^aH|223*w|A( z@`+PsYKG=qU#8U@|L>#nDYek%RJ}LYY;9@?HN%1c1R@B*kb5Br#UO+s91$3dA&5j2 zq7j2w#33FDNJJ8bA{i-Akcu>MHb!71a*&HWj6yy}V+_Wk0EH;RI22<% zCZGhRn21T3j43F?RFq>Hreg+XVisnj0+pD9D$K<^RAW9)Lk$+-bew@RaTdzvywb0Op+i?eUwBt^6pc7qKhr4h$?tvHg z;y$d${n&s9@E{(-Mm&s1@F+InF?3@y9>*3ufhVyQK0Jk|@eH2DbJ&LG(Sz;Sffw*1 zcH$+xj9qvIufmVl(2Lix8*g9_-o#$Kg+9EEcknLWLqFcf2lx>C@DV=7C-@YfVLv{{ z7x)qf@D;wsL41Ql_!i&cd;EaI_z^$h2!6&d_!UR-8-B+hIELf+6MwC42sN}oVw9L9 zW{E`-APJNNNrEL-Nr>dc+Cg#^CJC2BNCr!WNFpUsl4wbcBvuk9iI*fu5+zBJp^{`t zibRp5O420hl3|hz$#6-gBukPl86g=d$&utr@+6}q`I6C+F_N*80!g8yNHR`REEzAE zASscQN+wDsNhV9CNXjHrCFPQ7lIfBel9`fOlG&09Nu^|tq)IYZGEY)1nQ!RfhhkXY F@i(KBv@`$! diff --git a/dist/index.js.map b/dist/index.js.map index e865f61844a7ed86e0305db547bf2e529734cda4..07404dbddf82dbe66cb8e77c7650d0a1da809bab 100644 GIT binary patch delta 1228 zcmZ9^SyYU19LDi8ZOW)7mCD=nR+FWy*_R?p$d)BS*{Ki}5|Sm1t%c&RkbTQigjd33 zC&eJjQqAEUS9H2@op0s1aPc|kInQsoS>9}Q@JzE+@d%CZEOSu{??QWHPQuLgVoI2; zwlx@kn7gzDrQF~cr4lBCv%2JW$8)n4mJ!5(hn=Xb3}ypERKl$^Ix zyrnRnZQCh5TqA{ut&y^e$WC;();HBkaEDfDs`aP~6DRL!t3~lI$wpK~%AJJ9SI$-H zePu5{VIL(>of4ZW`Dr)!vsvkBuvH>gkvhEVLE0Y z0y8lSk(iA+n2RVxV;<&X0TyBr7GnvPVi{r(i#ROD3amstR$(;~kccF#!CI_CGS(vn z8?X_Zkc!Pn!xn7CHf%>ac3>xVL669Qd zJj5eB#uGfnGd#x&yhH_Fp%PVijW;mjE#Bchs__9IQG;51!e@NJSJa_iX-sPfUHAte C0+~Mm delta 1678 zcmb`_Yg80v9LMpqz%B}s%N?0zW`Ga{3WyX_Bns2gkTuP;NUoa#3p?zxS%#OwqOuS~ z{i|J|w6e^S(ALUg>1J9Xm2|bD&gpG=>_z9)G5W%Gj{2%Mz4)AYo|*qVzyCb*Y}-3( zIqV;`94fSS+Ec}UBtE>$l{_>)koI%d2r&l3CifLZ=CACu_jDCShRN>bvBx{@^W|)R ze0bll>oZJZEsqHA8+2|qiGNwlPRXAemC|WnKVJNoGi;C8TjRo|!xXZ;*B)&WBZ%1s zJtT9iV8?~)K;MYJK6rfD*7M%B^Ij8z5R4F*VL>P+U?Rd0j!B5XWta>rA`yjX#2^-N zh(`jZAklZ;tE^oim1mSWV(hY6vYRX2%?sQvuQ4rssiWCz=$!n4T0O2kUgJY%Eiz_*|!y z26NzM_pnlw>$xbc*y*Tj{I5Lu>CdES@t;vFW0|q?$7yAs7^}3jNr9KET@8lQA^wu2 zKz183up!CUJ**Zi^5x{&vdrR3)((h0P0y2}L_Jgrw`i(wQ;HUx5$LX>T}_ajbk!=y zhLu#?#eEtsPqSX-t##Juo@R&P3A9vrGSebC`_&K`EZ0Ki#A2;gMlI?Dxn!l;k|VYV z=_po0Wyqwa`Rpay8ji%+E?rWXs$3H3cKi>CzKT-q_k@4HKf6}@S$g`FSz$KQl$=S+dXN#IX zwoi%UC&+ryKONsDS<;jCqGkn3FC3J~za=HNH5eLnjEz%}ip!CPsYu5( zOh*PXk%cR8C9;u&TwH}bT#Xr+iG0k$HJFV#D8O74;#w5pI$V!p%)_65N8NScY4%9JgTwR^oQtfim2QRVYUVDp7@M)WCteuo`Pni#pW9i3T*n z1p`fR!-HmcaW~fD9^8v{xDPE@j}6#}O}HNqpcR|(ARa;+9>ybh6kG5Z9!ER2q63}S zhAwQ!4(xl*oW?M| Y#8>zl-{4z(hcoydKlmDqAJZ!T0S6M#VE_OC diff --git a/src/model/cloud-runner/cloud-runner.ts b/src/model/cloud-runner/cloud-runner.ts index 671c7560..5c9b7dae 100644 --- a/src/model/cloud-runner/cloud-runner.ts +++ b/src/model/cloud-runner/cloud-runner.ts @@ -87,14 +87,12 @@ class CloudRunner { throw new Error(`baseImage is undefined`); } await CloudRunner.setup(buildParameters); - if (!CloudRunner.buildParameters.isCliMode) core.startGroup('Setup shared cloud runner resources'); await CloudRunner.Provider.setupWorkflow( CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters, CloudRunner.buildParameters.branch, CloudRunner.defaultSecrets, ); - if (!CloudRunner.buildParameters.isCliMode) core.endGroup(); try { if (buildParameters.maxRetainedWorkspaces > 0) { CloudRunner.lockedWorkspace = SharedWorkspaceLocking.NewWorkspaceName(); @@ -125,14 +123,12 @@ class CloudRunner { CloudRunner.defaultSecrets, ), ); - if (!CloudRunner.buildParameters.isCliMode) core.startGroup('Cleanup shared cloud runner resources'); await CloudRunner.Provider.cleanupWorkflow( CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters, CloudRunner.buildParameters.branch, CloudRunner.defaultSecrets, ); - CloudRunnerLogger.log(`Cleanup complete`); if (!CloudRunner.buildParameters.isCliMode) core.endGroup(); if ((buildParameters.asyncWorkflow && this.isCloudRunnerEnvironment) || !buildParameters.asyncWorkflow) { await GitHub.updateGitHubCheck(CloudRunner.buildParameters.buildGuid, `success`, `success`, `completed`); diff --git a/src/model/cloud-runner/services/hooks/container-hook-service.ts b/src/model/cloud-runner/services/hooks/container-hook-service.ts index 343429c8..c93fe7ee 100644 --- a/src/model/cloud-runner/services/hooks/container-hook-service.ts +++ b/src/model/cloud-runner/services/hooks/container-hook-service.ts @@ -1,6 +1,5 @@ import YAML from 'yaml'; import CloudRunner from '../../cloud-runner'; -import * as core from '@actions/core'; import { CustomWorkflow } from '../../workflows/custom-workflow'; import { RemoteClientLogger } from '../../remote-client/remote-client-logger'; import path from 'node:path'; @@ -237,13 +236,11 @@ export class ContainerHookService { ]; if (steps.length > 0) { - if (!CloudRunner.buildParameters.isCliMode) core.startGroup('post build steps'); output += await CustomWorkflow.runContainerJob( steps, cloudRunnerStepState.environment, cloudRunnerStepState.secrets, ); - if (!CloudRunner.buildParameters.isCliMode) core.endGroup(); } return output; @@ -256,13 +253,11 @@ export class ContainerHookService { ]; if (steps.length > 0) { - if (!CloudRunner.buildParameters.isCliMode) core.startGroup('pre build steps'); output += await CustomWorkflow.runContainerJob( steps, cloudRunnerStepState.environment, cloudRunnerStepState.secrets, ); - if (!CloudRunner.buildParameters.isCliMode) core.endGroup(); } return output; diff --git a/src/model/cloud-runner/workflows/build-automation-workflow.ts b/src/model/cloud-runner/workflows/build-automation-workflow.ts index c812e123..08a58b89 100644 --- a/src/model/cloud-runner/workflows/build-automation-workflow.ts +++ b/src/model/cloud-runner/workflows/build-automation-workflow.ts @@ -2,7 +2,6 @@ import CloudRunnerLogger from '../services/core/cloud-runner-logger'; import { CloudRunnerFolders } from '../options/cloud-runner-folders'; import { CloudRunnerStepParameters } from '../options/cloud-runner-step-parameters'; import { WorkflowInterface } from './workflow-interface'; -import * as core from '@actions/core'; import { CommandHookService } from '../services/hooks/command-hook-service'; import path from 'node:path'; import CloudRunner from '../cloud-runner'; @@ -21,8 +20,6 @@ export class BuildAutomationWorkflow implements WorkflowInterface { output += await ContainerHookService.RunPreBuildSteps(cloudRunnerStepState); CloudRunnerLogger.logWithTime('Configurable pre build step(s) time'); - - if (!CloudRunner.buildParameters.isCliMode) core.startGroup('build'); CloudRunnerLogger.log(baseImage); CloudRunnerLogger.logLine(` `); CloudRunnerLogger.logLine('Starting build automation job'); @@ -36,7 +33,6 @@ export class BuildAutomationWorkflow implements WorkflowInterface { cloudRunnerStepState.environment, cloudRunnerStepState.secrets, ); - if (!CloudRunner.buildParameters.isCliMode) core.endGroup(); CloudRunnerLogger.logWithTime('Build time'); output += await ContainerHookService.RunPostBuildSteps(cloudRunnerStepState);