From f7d4ece67feb2628f5519ebf5b1bbbc88f444f74 Mon Sep 17 00:00:00 2001
From: Andrew Kahr <22359829+AndrewKahr@users.noreply.github.com>
Date: Mon, 27 Nov 2023 11:18:23 -0800
Subject: [PATCH] Graceful exit to ensure outputs get set

---
 dist/index.js                                 | Bin 22177787 -> 22176637 bytes
 dist/index.js.map                             | Bin 14648810 -> 14647481 bytes
 src/index.ts                                  |   4 +++
 .../cloud-runner/providers/docker/index.ts    |   9 ++++--
 src/model/docker.ts                           |  17 ++++------
 src/model/exec-with-error-check.ts            |  29 ------------------
 src/model/mac-builder.ts                      |   5 +--
 7 files changed, 20 insertions(+), 44 deletions(-)
 delete mode 100644 src/model/exec-with-error-check.ts

diff --git a/dist/index.js b/dist/index.js
index 08c80b07870e63a3e7a23371c8ad163d2bd95083..21d73e1494b58eae57e04d87b6114894c487777e 100644
GIT binary patch
delta 1901
zcmZA1X;f5Y7{Ku}aAz16kwG?byNrl{vbvxsi-0?d8A(M819OE*oSB$GFf%JFN-H(A
zx3WyL%~mUIGBYX3!b&PzZPC)oR;?&2wfaBdhfepL-~YqC?|q;5ez~W*yTZ=w?F!r4
z6RwWg%_;32R<q4#_@_8rjfOL|rli@`=+xEf6u(`aTw}JW)zyO|)#3HAQEJvc&AL1>
zqAfAP6iAE+nir$Ig=UK~>}FeFksfr!v@C5xn11%k%F@d`bqkCp-RUuW?%{sjXm$B@
zk6WM5B;D<4(S07>;dHv(^}4^o<<tEh-EjMwn+(0yXmBiYd75<YHoNN@9PWC<`QM!@
zE6OVJ_36CRV6fhyHyDlH`OSHadW&PRY*goAr-g<*@10xcaT<E>j+~;_@cI9p*IH+I
z{bA~;-JIT@-D9)-@9Se#$FA+xHlIBx;IjvBIIha0wVmxX+s(>VWJysW{j`<{kJs;F
znqHtUS*j}Iwd8<3Myocd?%YtT+8C?#PdK|G(^c>GG#PUZe{++&l=G<WH9HcNHznAj
zym4BnT4p!%Mw}L}wjGF%Qr;CIkpXkORuvsMouQprtK3DFBsFM{X7sMyvPY{@>-L+I
zRZ-3+t12$HhpVDPrpUIWP7P*Q5CSVg5r%L?pbuniUqr!%X!Ju2ViAXUB%nVMF#rQG
z2!k;MI+9?=P$Xj*QZO8;NJBbCU?eh-i7aFz2e}x9(HMiV$ip~{M?NNCA_`E5A{1j1
zN>GY2OvV&U#WYOE49rA1W??oeFbC&gF3v?I&ci%Z;e1?x3sH@Wa4{~yrKo`ewWxy=
z2Iiw44RGNyEI=a`!VM3+xExLJ!H;GvLJL~47*}8kuEbJYg=M%J*Wg+#$91?KH=qqS
z;wG%XO5BWFa4S|}HP+xZv|}yS;dUt8fje;**5hv6gAKSB8?g!ZVKeT>19%V*;bCmS
zBX|^#;c+~HC$SYz;b}aBZP<=y5x{fUf#<OkFJKp5#BOxpCA^G1=)^17i&ya)y08zg
z;|;ut{piM9cpLBF0N%xWcpo3&LwtmT_!ytyQ+$R)IE>Hn1&-h-zQkAf8prSrzQuR=
z9zWnm9LEX#grD&XdhjcL!%6&(Kkz3`;WW<RFZ{hSsnfIyk|0U2M3a~$7D<T2DhZW@
zNx~%&l0K41Nnc5n#3qTB^pnI$VkL2scu9h!za&vIKr&D=NHSP5M50TQBzDPANwQ>^
zBt<e@k}64)q)SFfMoKaynUX9?wj@WAD;XsjEg2&jE6J0LlZ=<-OD0GrN(v-}k|Ig5
rWRj#rQYtBvOqNWMOqEQNOqa}%%#@T%W=UpCDkO7EyZN7(4sQMj*ozU`

delta 2715
zcmbW%2~<>79DwmN_!tmIKn58_!G|CLB1^7;l!+VWnw6C(jx!G#odxI3<erh0m6est
zZBNto4YQ=Iq|z4Kv{kdR()LAdU(D+JKeE%&Q+eW?-#46D?!E86J9FrntqBLWZB1zU
zE>Z2C8*f+l-F{oVN~y?7S=8uQ+~}}1H#%Y_r>T_PHhc3Addyy%y-2Tf`%Sg3G{(6&
zDL1A$DYwnd`&G+9EjD?UFH&D?gu|h5t*74bsBt&eWoW(1`j)A+PHl@?mZr^8>mP{8
zRs-5CkM9%=^^BT^-!RRd(V*9;^92oWg3h0s8Pm?G8eLjPy-2r)n^12ANBK<C7o2u_
z&=;9ADC+ZjPc_Ww%Bsg)&E*}mi8j^rc;`g*{E94xDz)+74e45jx_*+Yz4|g;Yuo*Z
zrOl`<D>h~uo(ZgYh%C5@_0CWS(=|Q&zvlEWdvcvq9f)&esRNs|<YOPY(~6|ngku`M
zgKFBLB{rA1w6jy&uz_lwkvTza-w<D|R(+PKB^|Ns_FrT=)mP>AoPgV$6ZGhH(V!>d
z3kCI~FEQT}3IyCi??`sLNOy;)MFU1KV%8Svp$7Sg`JY!GG4)F82pFnyy4|Jp%vp9d
z<s&V_^$$a<?3%c=?CgKPk^YF9Ile6i?PD!&p)uPRsS0_G3hOv5uv${0TlYw>3x!(`
zg{k|3dZgaat<#{(aqzP^)3C1H`jCeUis%7%#8c0r!`3^B&4@P?jTBqY=9f&)sWA&%
zM`(TBtm$eN=HwR_7EB)Rn`@Mp1k8fgh4||9eEF2J?bMvAsk<XK_3)&Xt&>bFo1|7d
z9nOWJ@Tfm0oqG7FvbMkGw2quv&dm8W-W~<HC4oPukmE1YSew;4L|&dgIvSX2go_*8
zVbiD%M*j9H6Bg-Zr3HF+Wu?x;JnOP`HD>*ySoOs8Sf|>uM|1YE7QvUt+OCFhXgYgT
ztdI2@Zqr~}++OPie`uO%ZLimexP5+g-l2>PmGYb;SuM@Gz`k;RT%t8v-~Tn5sZ!QE
z(pB>2c>4gpdWUcDf&^oBLnzGN9DP=~Wk)}$%DOCcH7_a9_AURH-<y@2G~Y3PF=Jb_
zv((06-JHv|Kb^FAO^b$D*b#?#v_%3E;Xpgcdy|oZ_DF>jY3P7-xX=-ukb%zVf=pzg
zD|BR|8*-3~?#RP&$VUMR(E~;3iDHzX6lFLbz0ezd&=>vCA19z36&Qd@oQRV!5GP|0
zsxTNsFciZu9Mu?sQ!o;vFdAbp7UOU##^W@cjx#U;XW}fJjftqiBuqvvrofG<@W2ZL
zb(n^F_%Iza;70&KgwTMQ2*X4KQJjNWn2kA@i+Pxj1vnQAaUL3RJ{I8uT!@RX7#HIb
zT#6;Q442~yEX9?$3RhzpmSY80Lg5-*i|cSbZorMW2{&UER^t||!CKsk+i*MXz@4}Y
zcjF%1i~Ddtny?NJU_BnhL)d_3Jd8)M5s%_AJdRCh!4r5APhm5*;AuRAXYm}i;(5G)
z7x5Ba#x`unD|i*J;dQ)$H?add@fLRBZM=hbu^aE<eSCmD*ozPG5kAHz_!OVvb9{j>
z@fG%AKMvq)e1mWC9lpm8_z^$hXZ(VL_!Won8-8E1rp2}tk{C%Fi6)7a*d=k2cu8AH
zf+SJmkhGH|Ns=WglJ=5RiBpm$=^#m$xFj7Vog^8O&XO*YOi7lct3;P%OS(yNB)O9A
zl03<Al6*;lq)^gBQY7gqDVCH-N+o5I<0ZW$y(N7leI@-Q{Us+z$|V(&0g_6|iIS5f
t10^R*21%+UgC#>GLnXr`!zI;{5t36RBPF9Gqa|Y`V{I+`p4fJ+`2&kt-U|Q#

diff --git a/dist/index.js.map b/dist/index.js.map
index 6266331fe38b0731a3db29f087c439bf65d0e795..dde444c08583a4d7f006afa2c3c63ef2f01fcd65 100644
GIT binary patch
delta 1541
zcmZY5dr(wW9Ki8eS)S`EC<wH;d&JO86oatRBt)#N%&qKUp|b2=*v;kMWgiNWf%sU{
z5;oIQ<OcTeRVKR1&63hGQ?n4u((F0?)6_UI{Zs$M^j++~?#yTAob!8~dw$zIlyr2>
zP*P8aL00e0%$5I)9XGJeo@tWitLbL_{Kd2!!`2Q%TC8iKDIsFtC##J{lbn7y^KWTy
z$X*t)tMRDx4JCBO22c7DWOq2*q;JVG{%JU9FEq&R`DRnBA-%USV$Y3d>Rnalb_1zp
z32aTV)QXbA;SM9LMi%N3LcP~Q;XsBtVow~79^ajDES@j>e@)*Mv3JK0*GAjI(KZ7{
zAOS`sA_>VzK`PQ<!bq4g3Zs#Z42;28WFiaW^k`f5rC3;>nS)$ipLt#1kUZO-mmv>?
zMUE_5Z%vWirIzI6>WYxZ>k_i%uSmW;v@<VTR-dt?%J#Zh7Fn)ZxlE}Ad3v;T{OD=Y
z*J(+TSz(c(AF3HYWRTl?t)p6sibSR6T%q`dOH%^s<e*R*Jwc(VqSoQ@3RPPr0-A8R
zTpqPf1l^v12x>x610la6Y81C)rAPA%PD85G?NI9!SCzj?75{xSU%aSt(JZlmGPgpB
zL%0>MuQucrs~k<VDi%(SX7x%uer>c<b1C9lQ!Y}Y1cJjO8=Z<T7;i2+!(y83*)Ti(
ze-Dr!KIa+_tA5U9yOJaaSJ+O=pIb$V?DN_}BQ;;p!!$8RG_RI(8*G#1PXkt?{!6`0
zGf30e%c-(SvsvW+s}pnNh5S>QvTTnfS(fkR**XeDs<gXBO13|w&eQ7a9jdF4pLQv=
z9#vr}Ped&f^gn#I{xQ0JqpfR){Jm97ktGG9cDPO+FAz)Rj3uI24z^knw>MkOa&T&1
zTDWqOzy#!DBCbaPCSfvez!cnwsVKxWOh*xB;3gEK1UI7;GjR)U#ch~{*|;5ZP=-5D
zj=8A7JXB&n?!;ZV8w+p`?!|pri2Jb!c07Ow@emf{VLXCI@feoiaXf)4EX6V`M>QO%
zffFt$s6`#z@Zd?TfEV>pp}~g+_z^%5A*{qIG@=Plp&3tOHJ(8WTCoOgSc`R7j|~W8
zBc8=3Y{qkV9$V0k4n*(*w&F!>!*)o#gqP8YSFi(7yoxS#V<%q2>v#iiVi$H}5B6do
z-oo41k9TkYJvfL%h~Y4fpcgvc#ZkP6_i+q;_y8Z`I8NXre2kO$1gG#RPU8&D;xnAX
m=lBBsIFA8bz?b+67x6W|!6jVAx444u@I8LeD<}Q9Yx%!pjzALt

delta 2562
zcmbW%dr(wW90%}0U_n+CmWSwF*aIjoxGZcc2}mJIrXj5wS+Tk-yBAnx@2>aW%~y(I
zh2<lN@@JW)rc&mMC^vj0R%Q=WGRx8|n#QpjC-XlWXQ=PJWR4><YCH3py>ni_bAIP{
zZ~O8d&F`yvG<zF^nyt|h&EYY{P1e<T9MNj+uQs(Eo2m_NvhJYnYtdRd*cN-03hQ)Q
z%J=GyC{y;$7<>u+N%ZG$!P-FQ{DB4inyf!l;ar`zZCTVllQJeqZoA^>3{f82vWrHW
zFkE@2rCq^lKaI<Y9I3Y8p^^&EM{>=LWg#>!D0W_(wc|jrI&+Yui&O_)zMz{$T~i{e
zsH=ZSe5*Afh&G*#(ylPoH<;>!pdSQ72!w(L!XO;_Lj-7H07Sw-7z9xe4LXQ{Scrr8
zfT@1)nYI{y0q@M5@0M#ac~SI=na&!X_NFIfH3a7*z>q+2&d@_WwASAqM%i3`B3VbU
zaQdrRKcK-kh68<zZ%kq)b?o9afriS&o*+8;YhE1H^(2Nhbn=Oi6zJp)=QIUMD7zBM
zu7<KBlyk1#!U~wk&-1%Q-e^lPXZ5im=UiI~ZKySzri~uMBKjpdaTt|cYYmSVyqSK9
zujM5v(=WLAD!0J9Y$A=@dT2<ViSdFgF7$cbf?VW~Y7nN%Q7iFiR}MO}h8L!~CCM#R
zmkDlpVUgcm>zd9>{#uzV{-gxzK9v*_C>0FeASx{9LTJyGv0=3BVBR3A=%)`Mdt+KS
z9rYUYw0pH)OV%x%#%#>S;(Z^|thCR>*^8Cn6O@xvy3fE;?qEBcl_(WjeJK51mK05F
zjv;c?-GxdwihhCeoGj@M<0a6h8Wt6B`V1#^RMDa@(e<%^OI%(&oiMO8mqS`8I9Zin
zaLR74pyuG_vl^XVkH;anN^nCa<`Ap>9^8&(H!-hInIhdm8gMJIbn$|55Owcw)zGv_
zY-s82mQByMi8g`Z=dNPL<lEdl&9fU4D7%FV3*#5K<q2LFji1&YQ<s&+)Ei?}Ua_}&
zB<2>FT*EW9Y*=sINKE3@1YD2l#KC0damY@k`b4$3%#!T#`en1)YRsCQYO_fhy{q&N
zkd%g0qd6me_6+wTJ}=7?E8Tnybt+k8E{?jkaG}xHqZjmsDz}j3BvREefrZvh{Wo~!
zjq;ZMi>=n8l&1tV+H9_o>BF)-H$q*{nwqrUb<)yUsozt{i)Nogl=#VlY`oE1Zkc6b
zmh5zvTu{L9w-{-lC29C>G}bc>EnCh-6J1P=$x!!#_fAcqPxQ_~*38UW%R3|<S#r44
zj#_WEL>&{^aHSOcQzMrfN|#ygVCrhphtv9tsk*ydD1mnBvC!I{+%SsD<TOQiC)G>l
z)goD<+#0{Y=M`nCkGB;Uc<U<=7=Ml{4ki0lPD95HiKD2llp9EE8aa+SMj289-75`O
z*5&-aPaa(|FnRc`bNkpERWW9#KeBTZ*Bv%QG{ht`NQM+hg<&up(qIG_AssScB$yx*
z%#a1yV1avJ6pV&3kOTL^SjdGu$cJ%I0QbTDPzd9p2qwTpD24}M5<Cc#VG2A1B`_6A
z;bE}CG?)%E;1MW;M`0#B29LuNP!2Yj1+&2p72tqMaDoeXsDf&!0XNKnxljup5WovQ
zm<J+AAcG&Cg!!-l7Q!M}3{SxlSPFHp43<MZtbnKC8F&^NU?n^U&%-KM4QpU6ya0{R
z1TR7}yaX@9Iv`jNufVIY0bYZR@H)H!n_x3+fj40*Y=iC40&l_Fumj$Kov;gb!yecR
zt?(|i!F%vN?1KP&0PV0J4!}V;1Rug-=zt^e5qu1vz)|=Vj=^W}IeY<MLMI%D6L1o`
j;43%<U&Cqm2EK(e@Ev>)XW<<D0O#SyKuq#a+wK1V`bBzz

diff --git a/src/index.ts b/src/index.ts
index 413ace33..9e11f34c 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -40,6 +40,10 @@ async function runMain() {
     await Output.setBuildVersion(buildParameters.buildVersion);
     await Output.setAndroidVersionCode(buildParameters.androidVersionCode);
     await Output.setExitCode(exitCode);
+
+    if (exitCode !== 0) {
+      core.setFailed(`Build failed with exit code ${exitCode}`);
+    }
   } catch (error) {
     core.setFailed((error as Error).message);
   }
diff --git a/src/model/cloud-runner/providers/docker/index.ts b/src/model/cloud-runner/providers/docker/index.ts
index 6837b1a9..42044182 100644
--- a/src/model/cloud-runner/providers/docker/index.ts
+++ b/src/model/cloud-runner/providers/docker/index.ts
@@ -133,7 +133,7 @@ cp -a ${sharedFolder}. /github/workspace/cloud-runner-cache/
     if (fs.existsSync(`${workspace}/cloud-runner-cache`)) {
       await CloudRunnerSystem.Run(`ls ${workspace}/cloud-runner-cache && du -sh ${workspace}/cloud-runner-cache`);
     }
-    await Docker.run(
+    const exitCode = await Docker.run(
       image,
       { workspace, actionFolder, ...this.buildParameters },
       false,
@@ -150,9 +150,14 @@ cp -a ${sharedFolder}. /github/workspace/cloud-runner-cache/
         },
       },
       true,
-      false,
     );
 
+    // Docker doesn't exit on fail now so adding this to ensure behavior is unchanged
+    // TODO: Is there a helpful way to consume the exit code or is it best to except
+    if (exitCode !== 0) {
+      throw new Error(`Build failed with exit code ${exitCode}`);
+    }
+
     return myOutput;
   }
 }
diff --git a/src/model/docker.ts b/src/model/docker.ts
index 815bccae..6d7b2843 100644
--- a/src/model/docker.ts
+++ b/src/model/docker.ts
@@ -1,8 +1,7 @@
-import { execWithErrorCheck } from './exec-with-error-check';
 import ImageEnvironmentFactory from './image-environment-factory';
 import { existsSync, mkdirSync } from 'node:fs';
 import path from 'node:path';
-import { ExecOptions } from '@actions/exec';
+import { ExecOptions, exec } from '@actions/exec';
 import { DockerParameters, StringKeyValuePair } from './shared-types';
 
 class Docker {
@@ -12,10 +11,8 @@ class Docker {
     silent: boolean = false,
     overrideCommands: string = '',
     additionalVariables: StringKeyValuePair[] = [],
-    // eslint-disable-next-line unicorn/no-useless-undefined
-    options: ExecOptions | undefined = undefined,
+    options: ExecOptions = {},
     entrypointBash: boolean = false,
-    errorWhenMissingUnityBuildResults: boolean = false,
   ): Promise<number> {
     let runCommand = '';
     switch (process.platform) {
@@ -25,13 +22,11 @@ class Docker {
       case 'win32':
         runCommand = this.getWindowsCommand(image, parameters);
     }
-    if (options) {
-      options.silent = silent;
 
-      return await execWithErrorCheck(runCommand, undefined, options, errorWhenMissingUnityBuildResults);
-    } else {
-      return await execWithErrorCheck(runCommand, undefined, { silent }, errorWhenMissingUnityBuildResults);
-    }
+    options.silent = silent;
+    options.ignoreReturnCode = true;
+
+    return await exec(runCommand, undefined, options);
   }
 
   static getLinuxCommand(
diff --git a/src/model/exec-with-error-check.ts b/src/model/exec-with-error-check.ts
deleted file mode 100644
index 3fe3030b..00000000
--- a/src/model/exec-with-error-check.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { ExecOptions, getExecOutput } from '@actions/exec';
-
-export async function execWithErrorCheck(
-  commandLine: string,
-  arguments_?: string[],
-  options?: ExecOptions,
-  errorWhenMissingUnityBuildResults: boolean = false,
-): Promise<number> {
-  const result = await getExecOutput(commandLine, arguments_, options);
-
-  if (!errorWhenMissingUnityBuildResults) {
-    return result.exitCode;
-  }
-
-  // Check for errors in the Build Results section
-  const match = result.stdout.match(/^#\s*Build results\s*#(.*)^Size:/ms);
-
-  if (match) {
-    const buildResults = match[1];
-    const errorMatch = buildResults.match(/^Errors:\s*(\d+)$/m);
-    if (errorMatch && Number.parseInt(errorMatch[1], 10) !== 0) {
-      throw new Error(`There was an error building the project. Please read the logs for details.`);
-    }
-  } else {
-    throw new Error(`There was an error building the project. Please read the logs for details.`);
-  }
-
-  return result.exitCode;
-}
diff --git a/src/model/mac-builder.ts b/src/model/mac-builder.ts
index 7524f961..1d4ddecf 100644
--- a/src/model/mac-builder.ts
+++ b/src/model/mac-builder.ts
@@ -1,9 +1,10 @@
-import { execWithErrorCheck } from './exec-with-error-check';
+import { exec } from '@actions/exec';
 
 class MacBuilder {
   public static async run(actionFolder: string, silent: boolean = false): Promise<number> {
-    return await execWithErrorCheck('bash', [`${actionFolder}/platforms/mac/entrypoint.sh`], {
+    return await exec('bash', [`${actionFolder}/platforms/mac/entrypoint.sh`], {
       silent,
+      ignoreReturnCode: true,
     });
   }
 }