From c13079a14ea12089b985ea29d8c535715b23be5f Mon Sep 17 00:00:00 2001 From: Frostebite Date: Thu, 11 Jan 2024 18:08:10 +0000 Subject: [PATCH] fix --- dist/index.js | Bin 22194085 -> 22194817 bytes dist/index.js.map | Bin 14668348 -> 14669232 bytes src/model/cli/cli.ts | 4 +-- src/model/cloud-runner/cloud-runner.ts | 3 ++- .../services/core/cloud-runner-result.ts | 24 ++++++++++++++++++ .../tests/cloud-runner-environment.test.ts | 2 +- .../tests/cloud-runner-hooks.test.ts | 3 ++- .../tests/cloud-runner-s3-steps.test.ts | 3 ++- .../e2e/cloud-runner-end2end-caching.test.ts | 5 ++-- .../cloud-runner-end2end-retaining.test.ts | 3 ++- 10 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 src/model/cloud-runner/services/core/cloud-runner-result.ts diff --git a/dist/index.js b/dist/index.js index c6f2472396b61d0b747701bab7c9811eba05ad1f..ffc84538e092a043bebf586b8d4640026d2c61e0 100644 GIT binary patch delta 1976 zcmajfc~F#f7{KvaZkLt&6qFT20RcG#L_jV%R8Yh;yF_4LgIvM(sOU1ZBD6w!tGCl2 zqmu|Cv$Qn3ql_-QjIz_HEW0ea^!qGe<4iN{%;&rN+j-{qKC^#p*WiG@`M`j__lQOF z)|}kc)+Qfyzur$RwFP^`CKlN1&8A84QK<8CwJ27* zS!*8B#kr(srlqU7eL?+)TgpSUqa6m9{91FP-Be|vk*tyL70Vj4Ra*EiH#>*Q#zud!5HnhL9H>y+hIt$oLCe{D!}30B)$ z12)*|>aAlxq2qe1F=zC?vD>rs#TAl3M@q>mfhkBfcwJ>8H8qkRKI3E^RVS^nP;6hx4CR~h5a49as z<=B8L(2R}Pge!3su0{*4K`S<63$Dd=xE^iTigw%p6*uB0+zbu3;8xs*+i?f(#5UZ8 z4s_yfY{xz5!o9c;_u~OPh=fS_063JNGH3U((3Dh38Birw8^D7IpO9Y;B~fZZr|cVJ?7cVKs} z-*+FrHG5{i?S~zCImx>GT#_~6b$|1KkEf#%5@9pWSlx}L;a+B7yo0lmGQ`DbIN;|0 zw}~;~Z9I%mn{0_;(V^a^&B-Ak=7q)2h#l-^?sK&FHCuStS&i1q{KuMcQD&TFyBTNa zx*{q$#2yYv1xGj`HPXO}v~Y$CT;T>A(!m`bNRJHggcrP#5t-nF%*cYQ@I^Lchadcr z138fkxseBXkq`M%00mJ9g;4}WQ4GaV0wocEQYeiwD2qUpLwQs{5GtY)Dx(U5Q5Drt z9W@Ywny7`^2t^&#MHuR#J{q7Q8lf?opedT6Ia;74TA?-Cpe@>=JvyKxI-xVVpewqe zJ9?ledZ9P^pfCENKL#Ki12G5@7>pqpieVUz5g3V47>!7b!B~vLcuYVPqA?MZFd0)Y z71J;sGcXggU|=@pAO;;$N-ib0l1Is_L_)UFr}VlKM%!{(DpBE*X08M diff --git a/dist/index.js.map b/dist/index.js.map index 05a8babad6463e301ef53c3899e73e197849183e..e94fb95e45d454f115a372e20b1d765eaa13d7e0 100644 GIT binary patch delta 1518 zcmaLUYfw~W7{Kx2wk8D2A_RE$Ca6InLKh8I4M9Z8lDt$BvMsv@cMBIhyIWaV63Lbt zu30=~Hz~V9Nm*@{ku4eBEa+kvLiy4((>TubrH|Qv7pTz>otfX6_j%6q&hxzQIdb5v zuD=&m>C!Lhdf7OnAKAM^jku9baAN7P`yIxI@4?S)SZncItJ^5gY|KU zM*)R&C8w2{QqyTPh_zZt6mLXHmBtfFitLOi zv%?D_iZNG0^9mA|I$K%;F1r@+dR5InvDsc)>{6Q@OjOVmovzNIIX0<&Rr3{DTLb>K zfWOG<*8=LqTgJ0&S<>n@rOEJ!sX{_sCcXTs4%cH9>Tm;AV-40~9d5);xEbqFk6X}y4QPZNx59xYIN^edW^9BT z9^8i8(Sl9zq7`k}3=KZ`5x^a|6L(3?#DK?;{kNwL2O4Sf_MlIV+VF( z7alGA1W({e?88%d8qeTaJcs@0!Si?l2k;_Z!pnFCui`cIq7Sd* z4ID&2-o#rtgtzey-bEPi;V|CE2RMQcF@TS76dxmkL41N^_!L9<44>l*e2K4c9AD!b i3}Xb};yZkgA8-Oc;wSu!UoeVaF@}@jv7S@*l79e(m;#po delta 1063 zcmZ|E`CrR%0LSr1%B03-rOCJ2fx9E1HXCXWxxC3`FOlvkGG?uMNw7SqHrXt3-kegBC=dnFY40N5uVCx_SSkv zlgh{7G=+Qp3s-}tG0AE2@kFlDVpUqa&W0uYFf z2$Gc+ZCsPpX6%Gube3&KDIr_b)#w!Bk4sXE!gxs|((RH~{E7-FsulVogRjVp2~k?jWns`kk1hyDS9C*n z^gsl9q8B338-36h{Sbv{^v3|iU?2uzFk&$TaWKG$p%{jE3`YV+U?dVT3Zs#PF&K++ z7>@~vOw7St%)@*vz(Op-Vl2T@EW>hS zVFgwq8>_GyYp@pUupS$*5u30XTabgT*oN)cft}ceT@B?oAl+9(08PR_M`hDS` diff --git a/src/model/cli/cli.ts b/src/model/cli/cli.ts index 458a8a89..739154a6 100644 --- a/src/model/cli/cli.ts +++ b/src/model/cli/cli.ts @@ -109,7 +109,7 @@ export class Cli { const buildParameter = await BuildParameters.create(); const baseImage = new ImageTag(buildParameter); - return await CloudRunner.run(buildParameter, baseImage.toString()); + return (await CloudRunner.run(buildParameter, baseImage.toString())).BuildResults; } @CliFunction(`async-workflow`, `runs a cloud runner build`) @@ -118,7 +118,7 @@ export class Cli { const baseImage = new ImageTag(buildParameter); await CloudRunner.setup(buildParameter); - return await CloudRunner.run(buildParameter, baseImage.toString()); + return (await CloudRunner.run(buildParameter, baseImage.toString())).BuildResults; } @CliFunction(`checks-update`, `runs a cloud runner build`) diff --git a/src/model/cloud-runner/cloud-runner.ts b/src/model/cloud-runner/cloud-runner.ts index 5c9b7dae..98c55a58 100644 --- a/src/model/cloud-runner/cloud-runner.ts +++ b/src/model/cloud-runner/cloud-runner.ts @@ -16,6 +16,7 @@ import LocalDockerCloudRunner from './providers/docker'; import GitHub from '../github'; import SharedWorkspaceLocking from './services/core/shared-workspace-locking'; import { FollowLogStreamService } from './services/core/follow-log-stream-service'; +import CloudRunnerResult from './services/core/cloud-runner-result'; class CloudRunner { public static Provider: ProviderInterface; @@ -159,7 +160,7 @@ class CloudRunner { CloudRunner.Provider.garbageCollect(``, true, buildParameters.garbageMaxAge, true, true); } - return output; + return new CloudRunnerResult(buildParameters, output, true, true, false); } catch (error: any) { CloudRunnerLogger.log(JSON.stringify(error, undefined, 4)); await GitHub.updateGitHubCheck( diff --git a/src/model/cloud-runner/services/core/cloud-runner-result.ts b/src/model/cloud-runner/services/core/cloud-runner-result.ts new file mode 100644 index 00000000..10f89724 --- /dev/null +++ b/src/model/cloud-runner/services/core/cloud-runner-result.ts @@ -0,0 +1,24 @@ +import BuildParameters from '../../../build-parameters'; + +class CloudRunnerResult { + public BuildParameters: BuildParameters; + public BuildResults: string; + public BuildSucceeded: boolean; + public BuildFinished: boolean; + public LibraryCacheUsed: boolean; + + public constructor( + buildParameters: BuildParameters, + buildResults: string, + buildSucceeded: boolean, + buildFinished: boolean, + libraryCacheUsed: boolean, + ) { + this.BuildParameters = buildParameters; + this.BuildResults = buildResults; + this.BuildSucceeded = buildSucceeded; + this.BuildFinished = buildFinished; + this.LibraryCacheUsed = libraryCacheUsed; + } +} +export default CloudRunnerResult; diff --git a/src/model/cloud-runner/tests/cloud-runner-environment.test.ts b/src/model/cloud-runner/tests/cloud-runner-environment.test.ts index a9d6b526..7ef6a154 100644 --- a/src/model/cloud-runner/tests/cloud-runner-environment.test.ts +++ b/src/model/cloud-runner/tests/cloud-runner-environment.test.ts @@ -50,7 +50,7 @@ describe('Cloud Runner Sync Environments', () => { } // Run the job - const file = await CloudRunner.run(buildParameter, baseImage.toString()); + const file = (await CloudRunner.run(buildParameter, baseImage.toString())).BuildResults; // Assert results // expect(file).toContain(JSON.stringify(buildParameter)); diff --git a/src/model/cloud-runner/tests/cloud-runner-hooks.test.ts b/src/model/cloud-runner/tests/cloud-runner-hooks.test.ts index 058b4fe1..cb849aaa 100644 --- a/src/model/cloud-runner/tests/cloud-runner-hooks.test.ts +++ b/src/model/cloud-runner/tests/cloud-runner-hooks.test.ts @@ -97,7 +97,8 @@ commands: echo "test"`; }; const buildParameter2 = await CreateParameters(overrides); const baseImage2 = new ImageTag(buildParameter2); - const results2 = await CloudRunner.run(buildParameter2, baseImage2.toString()); + const results2Object = await CloudRunner.run(buildParameter2, baseImage2.toString()); + const results2 = results2Object.BuildResults; CloudRunnerLogger.log(`run 2 succeeded`); const buildContainsBuildSucceeded = results2.includes('Build succeeded'); diff --git a/src/model/cloud-runner/tests/cloud-runner-s3-steps.test.ts b/src/model/cloud-runner/tests/cloud-runner-s3-steps.test.ts index e17d9bda..703a7f32 100644 --- a/src/model/cloud-runner/tests/cloud-runner-s3-steps.test.ts +++ b/src/model/cloud-runner/tests/cloud-runner-s3-steps.test.ts @@ -32,7 +32,8 @@ describe('Cloud Runner pre-built S3 steps', () => { }; const buildParameter2 = await CreateParameters(overrides); const baseImage2 = new ImageTag(buildParameter2); - const results2 = await CloudRunner.run(buildParameter2, baseImage2.toString()); + const results2Object = await CloudRunner.run(buildParameter2, baseImage2.toString()); + const results2 = results2Object.BuildResults; CloudRunnerLogger.log(`run 2 succeeded`); const build2ContainsBuildSucceeded = results2.includes('Build succeeded'); diff --git a/src/model/cloud-runner/tests/e2e/cloud-runner-end2end-caching.test.ts b/src/model/cloud-runner/tests/e2e/cloud-runner-end2end-caching.test.ts index 81a95aca..eec38243 100644 --- a/src/model/cloud-runner/tests/e2e/cloud-runner-end2end-caching.test.ts +++ b/src/model/cloud-runner/tests/e2e/cloud-runner-end2end-caching.test.ts @@ -64,7 +64,8 @@ describe('Cloud Runner Caching', () => { buildParameter2.cacheKey = buildParameter.cacheKey; const baseImage2 = new ImageTag(buildParameter2); - const results2 = await CloudRunner.run(buildParameter2, baseImage2.toString()); + const results2Object = await CloudRunner.run(buildParameter2, baseImage2.toString()); + const results2 = results2Object.BuildResults; CloudRunnerLogger.log(`run 2 succeeded`); const build2ContainsCacheKey = results2.includes(buildParameter.cacheKey); @@ -78,7 +79,7 @@ describe('Cloud Runner Caching', () => { expect(build2ContainsCacheKey).toBeTruthy(); expect(results2).toContain('Activation successful'); - expect(results2.split('Activation successful')[1]).toContain(libraryString); + expect(results2.split('Activation successful')[1]).not.toContain(libraryString); expect(build2ContainsBuildSucceeded).toBeTruthy(); expect(build2NotContainsZeroLibraryCacheFilesMessage).toBeTruthy(); expect(build2NotContainsZeroLFSCacheFilesMessage).toBeTruthy(); diff --git a/src/model/cloud-runner/tests/e2e/cloud-runner-end2end-retaining.test.ts b/src/model/cloud-runner/tests/e2e/cloud-runner-end2end-retaining.test.ts index c0b63ec7..b88940a4 100644 --- a/src/model/cloud-runner/tests/e2e/cloud-runner-end2end-retaining.test.ts +++ b/src/model/cloud-runner/tests/e2e/cloud-runner-end2end-retaining.test.ts @@ -51,7 +51,8 @@ describe('Cloud Runner Retain Workspace', () => { buildParameter2.cacheKey = buildParameter.cacheKey; const baseImage2 = new ImageTag(buildParameter2); - const results2 = await CloudRunner.run(buildParameter2, baseImage2.toString()); + const results2Object = await CloudRunner.run(buildParameter2, baseImage2.toString()); + const results2 = results2Object.BuildResults; CloudRunnerLogger.log(`run 2 succeeded`); const build2ContainsCacheKey = results2.includes(buildParameter.cacheKey);