From aaeb1d19477e483dbc4873d799992127376da228 Mon Sep 17 00:00:00 2001 From: Frostebite Date: Sat, 27 Jan 2024 12:51:35 +0000 Subject: [PATCH] fix --- dist/index.js | Bin 22194893 -> 22194929 bytes dist/index.js.map | Bin 14669149 -> 14670042 bytes src/model/cloud-runner/cloud-runner.ts | 1 - .../cloud-runner/error/cloud-runner-error.ts | 7 +-- src/model/cloud-runner/providers/aws/index.ts | 2 - .../cloud-runner/providers/docker/index.ts | 1 - src/model/cloud-runner/providers/k8s/index.ts | 1 - .../cloud-runner/providers/local/index.ts | 2 - .../providers/provider-interface.ts | 2 - .../cloud-runner/providers/test/index.ts | 2 - .../e2e/cloud-runner-end2end-caching.test.ts | 1 + src/model/github.ts | 54 ++++++++++-------- 12 files changed, 31 insertions(+), 42 deletions(-) diff --git a/dist/index.js b/dist/index.js index d546e50954c10f826fbba34005e1a7d2313b5ea2..7a54aa5a9d010a165e7dcb4da6255074e32d8291 100644 GIT binary patch delta 1932 zcmX}sdwk7h9Ki9{@9a6pcD6I;%$Qxw*=A$rGQ$kR+|A5}u1dSLvkN+MiDHBzS&XAS zvb1y&Sy9qatSKcCPNKV%RLZL9j>6}Ayk7oze_qe;`#jI<_5Afaa`KS%0(KnV;5oc5 z$8)MaaOb$X6^^AX4c?XpV{^Q|;xlS>(_WKJN2i-Yy~}(?bC&0DgH_x2n5y-$bW@N% zx;4P!jSn+b54o}7&6{YNSMI;;UA^Bl%+T)RMvV8;Uei9af4ZD0I{~$u0-OsL=xr_) zrDvrEJFc&m_$-k+|Lg{s*9w$VmAeMt^oQ@AElH%&2z>Q#%)*4VBdr zD{jN>n2bAcC#K*o6rd1AC`JkHMk!n9_}O%)q^viCLJ9Ik*pVF%S3S z0nEn&RAC_&;Xy3M5-i0-co@sD9FJfH9>q#j<1wtlYSds2*205zcpSCRSdS;L0d;s1 z8}StC@iaE!89a;U@H{r-1#H1qyohaRz)N@;+pz<$;8pCzYuJU?;l*yefj6-Sd(nuu z(1d+>8}DF0-o<-3fcJ3_AK(xU<3k+5Q5=I0AK^GY#tEFnC-@Yf;d6X}FYy&l;cJ}6 zH~1E3@Ey+Ld;EYOaSlJ>XPiefe!;K!4K28U-|+|j#9#Ou|KML-#3fwDfA}9)aCK!} zrLh_klO#Z*BxZ?4(n=C236fYP!IBV(O%f_;EwM`+k}yddNw}n~q@5%}(q0lNiIPN1 zVk8|Tv67AwrzB1iFG-Mek|au!B%LK)B*~Jlk`zfdNq0#PNl!_tq?aU3(p%C;(pQo$ z=_kpM^p^~f43uO_21y1>hDfp`LnXr`!zCjmBPF9Gqa|Y`*^;r69LYFIu4KF<{9 delta 1790 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 delta 4703 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 result(``)); } async cleanupWorkflow( - buildGuid: string, buildParameters: BuildParameters, // eslint-disable-next-line no-unused-vars branchName: string, diff --git a/src/model/cloud-runner/providers/k8s/index.ts b/src/model/cloud-runner/providers/k8s/index.ts index 12c734da..d7f01ddd 100644 --- a/src/model/cloud-runner/providers/k8s/index.ts +++ b/src/model/cloud-runner/providers/k8s/index.ts @@ -306,7 +306,6 @@ class Kubernetes implements ProviderInterface { } async cleanupWorkflow( - buildGuid: string, buildParameters: BuildParameters, // eslint-disable-next-line no-unused-vars branchName: string, diff --git a/src/model/cloud-runner/providers/local/index.ts b/src/model/cloud-runner/providers/local/index.ts index feaa3fdc..5c4ec8ba 100644 --- a/src/model/cloud-runner/providers/local/index.ts +++ b/src/model/cloud-runner/providers/local/index.ts @@ -32,8 +32,6 @@ class LocalCloudRunner implements ProviderInterface { throw new Error('Method not implemented.'); } cleanupWorkflow( - // eslint-disable-next-line no-unused-vars - buildGuid: string, // eslint-disable-next-line no-unused-vars buildParameters: BuildParameters, // eslint-disable-next-line no-unused-vars diff --git a/src/model/cloud-runner/providers/provider-interface.ts b/src/model/cloud-runner/providers/provider-interface.ts index 7de6aa0c..01dda311 100644 --- a/src/model/cloud-runner/providers/provider-interface.ts +++ b/src/model/cloud-runner/providers/provider-interface.ts @@ -6,8 +6,6 @@ import { ProviderWorkflow } from './provider-workflow'; export interface ProviderInterface { cleanupWorkflow( - // eslint-disable-next-line no-unused-vars - buildGuid: string, // eslint-disable-next-line no-unused-vars buildParameters: BuildParameters, // eslint-disable-next-line no-unused-vars diff --git a/src/model/cloud-runner/providers/test/index.ts b/src/model/cloud-runner/providers/test/index.ts index 853a00d5..e1aa0bc3 100644 --- a/src/model/cloud-runner/providers/test/index.ts +++ b/src/model/cloud-runner/providers/test/index.ts @@ -25,8 +25,6 @@ class TestCloudRunner implements ProviderInterface { throw new Error('Method not implemented.'); } cleanupWorkflow( - // eslint-disable-next-line no-unused-vars - buildGuid: string, // eslint-disable-next-line no-unused-vars buildParameters: BuildParameters, // eslint-disable-next-line no-unused-vars 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 854d2cef..f7c0536a 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 @@ -30,6 +30,7 @@ describe('Cloud Runner Caching', () => { targetPlatform: 'StandaloneLinux64', cacheKey: `test-case-${uuidv4()}`, containerHookFiles: `debug-cache`, + cloudRunnerBranch: `cloud-runner-develop`, }; if (CloudRunnerOptions.providerStrategy === `k8s`) { overrides.containerHookFiles += `,aws-s3-pull-cache,aws-s3-upload-cache`; diff --git a/src/model/github.ts b/src/model/github.ts index 0dd18637..de5a81eb 100644 --- a/src/model/github.ts +++ b/src/model/github.ts @@ -175,36 +175,40 @@ class GitHub { static async triggerWorkflowOnComplete(triggerWorkflowOnComplete: string[]) { const isLocalAsync = CloudRunner.buildParameters.asyncWorkflow && !CloudRunner.isCloudRunnerAsyncEnvironment; - if (isLocalAsync) { + if (isLocalAsync || triggerWorkflowOnComplete === undefined || triggerWorkflowOnComplete.length === 0) { return; } - const workflowsResult = await GitHub.octokitPAT.request(`GET /repos/{owner}/{repo}/actions/workflows`, { - owner: GitHub.owner, - repo: GitHub.repo, - }); - const workflows = workflowsResult.data.workflows; - CloudRunnerLogger.log(`Got ${workflows.length} workflows`); - for (const element of triggerWorkflowOnComplete) { - let selectedId = ``; - for (let index = 0; index < workflowsResult.data.total_count; index++) { - if (workflows[index].name === element) { - selectedId = workflows[index].id.toString(); - } - } - if (selectedId === ``) { - core.info(JSON.stringify(workflows)); - throw new Error(`no workflow with name "${GitHub.asyncChecksApiWorkflowName}"`); - } - await GitHub.octokitPAT.request(`POST /repos/{owner}/{repo}/actions/workflows/{workflow_id}/dispatches`, { + try { + const workflowsResult = await GitHub.octokitPAT.request(`GET /repos/{owner}/{repo}/actions/workflows`, { owner: GitHub.owner, repo: GitHub.repo, - // eslint-disable-next-line camelcase - workflow_id: selectedId, - ref: CloudRunnerOptions.branch, - inputs: { - buildGuid: CloudRunner.buildParameters.buildGuid, - }, }); + const workflows = workflowsResult.data.workflows; + CloudRunnerLogger.log(`Got ${workflows.length} workflows`); + for (const element of triggerWorkflowOnComplete) { + let selectedId = ``; + for (let index = 0; index < workflowsResult.data.total_count; index++) { + if (workflows[index].name === element) { + selectedId = workflows[index].id.toString(); + } + } + if (selectedId === ``) { + core.info(JSON.stringify(workflows)); + throw new Error(`no workflow with name "${GitHub.asyncChecksApiWorkflowName}"`); + } + await GitHub.octokitPAT.request(`POST /repos/{owner}/{repo}/actions/workflows/{workflow_id}/dispatches`, { + owner: GitHub.owner, + repo: GitHub.repo, + // eslint-disable-next-line camelcase + workflow_id: selectedId, + ref: CloudRunnerOptions.branch, + inputs: { + buildGuid: CloudRunner.buildParameters.buildGuid, + }, + }); + } + } catch { + core.info(`github workflow complete hook not found`); } } }