From dc4de429316387485c3ae967ed86661b3b8966b6 Mon Sep 17 00:00:00 2001 From: brian-golfplusvr Date: Fri, 7 Feb 2025 11:41:08 -0600 Subject: [PATCH] Added cloudRunnerRepoName to allow changing of CloudRunner launch unity builder repo --- action.yml | 4 ++++ dist/index.js | Bin 22304762 -> 22305050 bytes dist/index.js.map | Bin 14798618 -> 14798938 bytes src/model/build-parameters.ts | 4 +++- .../options/cloud-runner-folders.ts | 2 +- .../options/cloud-runner-options.ts | 5 +++++ 6 files changed, 13 insertions(+), 2 deletions(-) diff --git a/action.yml b/action.yml index 17c3441c..c82ad8cd 100644 --- a/action.yml +++ b/action.yml @@ -265,6 +265,10 @@ inputs: default: '50' required: false description: '[CloudRunner] Specifies the depth of the clone for the repository' + cloudRunnerRepoName: + default: 'game-ci/unity-builder' + required: false + description: '[CloudRunner] Specifies the repo for the unity builder. Useful if you forked the repo for testing, features, or fixes.' outputs: volume: description: 'The Persistent Volume (PV) where the build artifacts have been stored by Kubernetes' diff --git a/dist/index.js b/dist/index.js index ca8a3f2644dbe5f1848dc31a89d19c9aa38cdf2f..bb816cba5f60d9f7a83d8381ea64214fed03d8b1 100644 GIT binary patch delta 1590 zcmY+^RZx~e7>40N5s)7P6a|YA1;igrlveBl#qLDKE==qIJ3hO+6%|`Cu@mg>?(VoB zM-M!>?wOsPclT)bYhtSH>`ke*8|=f31A#7vU#Q6@D!N#+78Z8Igl6t&)P16C4fmJ(J;^7GMmzWb*iT zs;9SWT%2o*c3fa?9pm?B+T7~zxV?kZ@RYRplr#&ZLwZ;u1FT>T8)SqnOt3>HWJVTb zg*_aQ4cXy{9LNbLI3pKwBMAc7E#5QHKOWl$F3D2MW>fQqPu%BX^>sD|pOfe1vRCTbxHwNVFkQ4jUe z01eRyjnM>6(G1Pe0xi)BtjulvmRalKRSc`R7k3?+1Mr=Y7He(C6VjH$&2XkuowHV z9|v#{DL90~ID(@%hT}MalQ@ObID@lDMHfX%P_il66-On9l2dU~oRwTkZY7VBSIMWiD6Wc| z;;!UZJd^@TLB&(?QoNNyijPuQF)O}`pHf6AsuWX-DH)Be*^aln8yGB delta 1502 zcmXxkS6B!D7=_`d6b+-KLc><1l2VdnW+V+;RwYCkk-f>vUXi`B71<zfQoQ}Gb*7nTu=qBaDzLl!UNUd2`^NKH+)b7zNiU5)Pg^1 zBLHsVkh=CY{!5D&}7>3~(fsq)6(HMiV7>Dsl z!URmjBuvH>Bx5S3VLE1DCT3wa=3p-7VLno@01J_dMOcg_Sc+v>julvmRalKRNW)sJ z!+LDMMr^`nY(Y9Quoc^oiS5{do!Eul*n_>;hyBRH0c7JK4&gA4;3$saI8NXsPT@4p z;4IGJJTBlOa&QT`xQr{fifg!z8@P#ExQ#owi+i|_2Y84_$irhi!BafLbG*Pyyuxd| z!CSn;dwjr0e8OjZ!B>34cl^Ll{K9Yi!QW)IKLd)Pl20*GjFtRK0mVcyRm>D~rJzzs zDXbJxEEG$nsA8oQQ>+ym#a1b24mF7x_5~_qL;Re}!6a(+1e+o~dnE(I) diff --git a/dist/index.js.map b/dist/index.js.map index 6425497a4bc39cb0cdd61a55d084b09235d11873..20a83c2812831a235ba833d2036e5a9e9a36fbeb 100644 GIT binary patch delta 1093 zcmXZVX;jQ{6vpv`rb%N=i;2use~}a#`&PDWWvOI~XrYlPla!@}HpZ?o^dpSyM2ckW z>tr9Yg{-~t0`Jpn! zs0dumUyDOUqec0}Tpj1{2ukeUM!R<_v_=~^K?Y~Y;exhsg#zuMM0=><26uSC6CI$2 z7doO796vf+?cSP}D&b+%1Utp*GYz8gmyf#KrcwOslnt5yksI&#zjX|)O*W0HRG1^R zK|-pRWNzU(Y3V8YEXQ?0NNQTPaQ`m(ir;yXv(-ORtMn4CDO!anOVEaiXeyOsF)BGj z9~dO%=SxYV#->sKy)o(%weW#2{2-wV{LvNN5PMDhF~a$ArxU4ju9A%Q5cPIjKNrp!+1Vii^+7kS7> z0oGtG3Q>e&l%N#rupUNiz(#DsW^BP$Y{Pbx!Gs+!V<&c@90I$s2Nl?heb^5R4xkbT zaR`TT1V?cU$8iEDQH4`DjcS}h4Qg=~=TL|9sK*6ZaS@kr8CP%>*Ki#-a1*z18+Tws z1McD;?&AR-;t?Lhjwg7EMm)oFyueGmLK9x&4c?*|@9-WU@DZQz*{Vxy`DXY7Ssbe8 delta 1051 zcmXxaX;{kv0LSsC(A5036_aggqQzL{2$9^8E4i;&$IPgfG=vewCa=-S*OAl{+^E_UBp6B=ce!rG-r>xBFl+`(8VpNq%?lK6!#QNHRCYLGRPpXMg z=)F9O2DkUW(PI#jk9-FZRKO z{U|{xL>$0Dl;IE#;|Sb1igHw-5>+^c<2ZqnIEB-w#u?P$ENXEMbvTa;@ZcgY;W8v# z!Bt$tb=<&B+`?_t;|>~d7x&PJ`*?tdc!bAzf+jpgGoIl&Uf?BO;WggiE#BchKA;63 S@d=;t1z+(^vYEdBu>A!Dqqs)^ diff --git a/src/model/build-parameters.ts b/src/model/build-parameters.ts index 7d72569f..ffce5e25 100644 --- a/src/model/build-parameters.ts +++ b/src/model/build-parameters.ts @@ -75,6 +75,7 @@ class BuildParameters { public runNumber!: string; public branch!: string; public githubRepo!: string; + public cloudRunnerRepoName!: string; public gitSha!: string; public logId!: string; public buildGuid!: string; @@ -195,7 +196,8 @@ class BuildParameters { branch: Input.branch.replace('/head', '') || (await GitRepoReader.GetBranch()), cloudRunnerBranch: CloudRunnerOptions.cloudRunnerBranch.split('/').reverse()[0], cloudRunnerDebug: CloudRunnerOptions.cloudRunnerDebug, - githubRepo: (Input.githubRepo ?? (await GitRepoReader.GetRemote())) || 'game-ci/unity-builder', + githubRepo: (Input.githubRepo ?? (await GitRepoReader.GetRemote())) || CloudRunnerOptions.cloudRunnerRepoName, + cloudRunnerRepoName: CloudRunnerOptions.cloudRunnerRepoName, isCliMode: Cli.isCliMode, awsStackName: CloudRunnerOptions.awsStackName, gitSha: Input.gitSha, diff --git a/src/model/cloud-runner/options/cloud-runner-folders.ts b/src/model/cloud-runner/options/cloud-runner-folders.ts index afb8d038..ff86f17d 100644 --- a/src/model/cloud-runner/options/cloud-runner-folders.ts +++ b/src/model/cloud-runner/options/cloud-runner-folders.ts @@ -73,7 +73,7 @@ export class CloudRunnerFolders { } public static get unityBuilderRepoUrl(): string { - return `https://${CloudRunner.buildParameters.gitPrivateToken}@github.com/game-ci/unity-builder.git`; + return `https://${CloudRunner.buildParameters.gitPrivateToken}@github.com/${CloudRunner.buildParameters.unityBuilderRepo}.git`; } public static get targetBuildRepoUrl(): string { diff --git a/src/model/cloud-runner/options/cloud-runner-options.ts b/src/model/cloud-runner/options/cloud-runner-options.ts index dc09da5b..c2e7f6a5 100644 --- a/src/model/cloud-runner/options/cloud-runner-options.ts +++ b/src/model/cloud-runner/options/cloud-runner-options.ts @@ -74,6 +74,10 @@ class CloudRunnerOptions { return CloudRunnerOptions.getInput('githubRepoName') || CloudRunnerOptions.githubRepo?.split(`/`)[1] || ''; } + static get cloudRunnerRepoName(): string { + return CloudRunnerOptions.getInput('cloudRunnerRepoName') || `game-ci/unity-builder`; + } + static get finalHooks(): string[] { return CloudRunnerOptions.getInput('finalHooks')?.split(',') || []; } @@ -85,6 +89,7 @@ class CloudRunnerOptions { static get githubRepo(): string | undefined { return CloudRunnerOptions.getInput('GITHUB_REPOSITORY') || CloudRunnerOptions.getInput('GITHUB_REPO') || undefined; } + static get branch(): string { if (CloudRunnerOptions.getInput(`GITHUB_REF`)) { return (