From 2a32a9d870d75f2b6c81905daa1fd42e273e9f9b Mon Sep 17 00:00:00 2001
From: Frostebite <jas.f.ukcmti@gmail.com>
Date: Fri, 18 Nov 2022 20:43:52 +0000
Subject: [PATCH] Fix: retained workspaces must fetch before resetting to
 needed commit (#476)

---
 dist/index.js                                 | Bin 21967483 -> 21967786 bytes
 dist/index.js.map                             | Bin 16361186 -> 16361537 bytes
 src/model/cloud-runner/remote-client/index.ts |   4 ++--
 .../services/cloud-runner-custom-steps.ts     |   4 ++++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index 2689df0b683277d174b0de919a5f785393eb1dcd..0e9b969ed7d70e2c01da1b69b024c499c779d27f 100644
GIT binary patch
delta 1511
zcmW;MRale(5Jur=cR>Xd5hWB9B-TVhEHJS^MeOeG#LhLbTYn3?yVt<(?(W1+Osw;H
z@t$Yqb}lCMX_E8W<RoX?DARVcPl{8!w!K?-@V8q1?OrM7WEXqtUvpxZabknTeMacY
z2qV(l;%PjLu{hedg;{JKMq;3Yn>{?*;$bopf*b}Kwq@o3rxrC@_KNS=t$n27YPI+o
zwlR&;B*ev7-~dNxPm6SLf-_u@9vR?@jBrCHxFa*NzyqG}f;X}v8+_o4?8pH>_#-C*
z5QrcI!-`zUjXcPUe8`Uw6hJ|QA`FEPj>0H{q9}&qh(IJtpd?D6G|HeXqEHUyQ2`ZE
z3DJl_WmG{`#G)GFP#rZ;6SYtqbx;@eP#+D@5RK3nP0$q0&>St$60Oi0ZO|6&&>kJo
z5uMN(UC<TX&>cO{6TJ|R-spqA=!gCofPol<!5D&}7zP`LV+2NG6h>nV5-=9yFdh>y
z5tA?(Q!o|NFdZ{66SFWI2IgQc=3zb-AQ20(2#c`<OR)^gu>vcx3ahaOYq1XNu>l*g
z37fG6Td@t>u>(6{$1d!~9_&RD_F+E`;2;j+Fpl6Tj^Q{?;3Q7rG|u2G&fz>R;36*J
zGOpk%uHiav;3jV2Htygq?%_Tj;2|F2F`nQlp5Zx?@d7XL3a{}7Z}ATA@c|$437?UI
zFZhaY_>Ld=iB$Z;Z~VdE32`x|DNxLcMR8CZl{89PC7t4=I4dqndL@J6s$^8$luU}d
zl3B^3cqpEVm*TBtRkA5Qim#Gg$)Wfu{z^_IKnYZWlwifG<Wh1gd6c|LJ|({rq7+aH
zDxpf4Qb-9`3M)mFqDnEPxDug6DkYSXN-3qZQbsAOL@DKz@=67zqEbnTR{r0)vZg9Z
QRV7xbW;(z#F@?PP2hAoYSpWb4

delta 1465
zcmW;MRZx}z5JusF4^cn~2?G_RL=+TM3{VjSLB#Iv?ryOI5&KuMyD&iv?C$Qu?#9mZ
zdhwju>)n}M|187$=i?0P_;F^b=B`=kzFFpvY|?Cv1%al4oeg_aaxKFq-8RUGcQz$?
z8k0;u(MF;v#mne2F*C-11+u{s*^vWQu!aqCA{T672YWamHyq&vXSg5_@**Gd!xaTk
z5QX3dcNB&PJmCdz_@D@UQ51eChT`x?07{@F0uh8#D2*}*Mp=|Yc~n3MLQxTwP#IyU
zf^bBjDk2euYKTS*sv{OP5Qmzmh1#ftx~PZxXn=-jgvMxsrf7!dXn~e!h1O_;wrGd;
z=zxysgwD`yx}qDpqX&AT7kZ-)`l28DV*mzX5C&rihGH0oV+2NG6yh-&V=xxuFdh>y
z5tA?(Q;>kENW?TGVLE1DCT3wa=3p*Nn1}gTfMhJhA}q!dEX6V`#|o^(Dy+sDti?L4
z#|CUf3N~RgwqPr^VLMWhh8;-9PVB;N>_G<hVjuS701o014&w-p;uwzO1Ww`<PU8&D
z;vCN70xsebF5?QW;u@~w25#aOZsQK_;vViJ6A$nZkMI~z@D$JR953(^ukadg@D}gz
z9v|=#pOA&m_=2zahVS@+pZJB}_=CR*nK5QbP|OuWu~4!pmP&Rdhhn8zD>h0_C6{8W
z*eUjkgOXcuRGbuN#YM@Z<W=%1`4v~CfKpH?q_`>WN@2xA@l?DNZ^cI`qWCIB6+fkz
zQe5#@0+bR;NhMGTQc5YMl`=}OQdTLalvgS!AxfxHQK_U<R>G7jO1KiCR8=CCD5aVb
Wt^8khbxpBK4JFQOKhMPM)Qf-Vzt)HV

diff --git a/dist/index.js.map b/dist/index.js.map
index a64d613eba83a7a40a928da8ea37bf7f10e3691c..aed9d041376c00eb49a05c20ddd4d844b5992eb0 100644
GIT binary patch
delta 1153
zcmWmAXI#v20LSrHq_osk;u`Mnf1Ht!kX>X)ozTfvN(doaR>&repBdR(=24=I5+XY*
ziO%SZjObB5J$Qc}d>?*G3k>Etg$DC<&)@{DGBMiG(j-csX0+6q2(7=;H$iJ#v&9*8
z@kX5qYN0kvQ3qx)M_pLJ5>~K=4eG%bc2K|`4sb+$IH3U=LJ4QMz!h$21QjGS)*E%Q
zYp6v;cuZKNq|r!v(+oMlS|6Az$9M@3H?_Txs#O|MlCQE6sUEUIWV);EL{_zIr7y0M
zgPep^Aeo5(Z^=ejl*>uNDMWG>#dhjgQC3NOiX^qjE|<+kg`HZNVo*5<KcgHGpQlix
z37SHKW@wHUXbE?;f(Kfo4cfvJ?cjy>=zxy!MkjPe7j#88bVm>Pz!yEy3x4R0KIn^n
z=#K#y2!9O1U<4o#S`0xDhGH0oBN#f2KnO-+6h>nV#$p`CV*)}EhKUGA%^#BxiOHCP
zsffZfOvemFV<u){HexUbb1@I|u>cFP2#XPmC0L4OSdJBl!%D2eYQ$p=)?yvjV*@r~
z6E<TD60jACNJ27FAg~SFu>(7?3%ikuJ=lvh?8AN>z(E|sVI09x9K&&(z)76KX{6%}
z&f*--;{q;1k4w0W3}oU8vTzmGkc}K%#|_-XE#x8(w~>!KxQlxzz<oSGAs*rp9^(m~
z;u)T!2ruvwukadgP>i=I!8?@VJwBie27JUPe8v})!-%i=hVS@+3jD+`{Kg+t;xGQ`
K^AuGs$^QY1!y6U=

delta 1113
zcmXBKX?PX_0KoBQsZD!l&DuH~P4CJatIQUYvan*MT9e^bDms>9HW5l`hINp#){Ep=
ziYPY9Tk&cYbFPEjN`_U`a^?Ee&(nwBm;dwMyrU(qxv3?tE~~h@EG0f%Jh4kgePLEi
zcyCGjKy@^f|9_2?7IbJM)usl*tvQK#;n}q*ed`M|k6o3~P*pS(LmQ5xE$xUUj^k-h
zJOL6ofkZlx#EB%+krYztL}$9tm6JG`Q#h4wq;VSEBhgTB!q`afjlm%akr|D_^6YRz
zZhBHp|MWm)%zwe6PT{&kX>B8oN$D9e;nu_+u~iMp>GYr{r<1`MoXJ_7O(wnQO&`u7
zi*v~)hrXQ0`Q&l|{kV|+4B#U27|6w3!lmRhh{0UO<rFZ4p<KZ*hBJafMpDF;jN&Sa
zxteRZmJru5nlW6@SjI7)8@Q1POk@(1DPamXaWl7YE2Z2<8Rgv0RPNwTrg0Z{a}U#*
z!M)667WXlm3ht+p2Y8T&sA3Ltna6w{<`EX~C<|G{V^p)48kP{|ah~8wmhu$Kc$#N;
zmglHtInT3#mAt@<tl}kJW;JVgg;%Mgp4WJtwXEX}BCKZv8+ntri1Id@Xkas2*vdP+
zOC#^`J|FNQAMr6wY-2k+*vTh+$}T?RbH3n9zT#`X;ahgIhws?S_cZeZKk^eT>|;L%
h_?cfg$RS!e%&+{$@BG1^9N{ni=ATGI^1l@|M*+rz|FZx9

diff --git a/src/model/cloud-runner/remote-client/index.ts b/src/model/cloud-runner/remote-client/index.ts
index e86db9c8..9bd3533c 100644
--- a/src/model/cloud-runner/remote-client/index.ts
+++ b/src/model/cloud-runner/remote-client/index.ts
@@ -71,7 +71,7 @@ export class RemoteClient {
       RemoteClientLogger.log(
         `${CloudRunnerFolders.repoPathAbsolute} repo exists - skipping clone - retained workspace mode ${CloudRunner.buildParameters.retainWorkspace}`,
       );
-      await CloudRunnerSystem.Run(`git reset --hard ${CloudRunner.buildParameters.gitSha}`);
+      await CloudRunnerSystem.Run(`git fetch && git reset --hard ${CloudRunner.buildParameters.gitSha}`);
 
       return;
     }
@@ -108,7 +108,7 @@ export class RemoteClient {
     if (CloudRunner.buildParameters.useSharedLargePackages) {
       const filePath = path.join(CloudRunnerFolders.projectPathAbsolute, `Packages/manifest.json`);
       let manifest = fs.readFileSync(filePath, 'utf8');
-      manifest = manifest.replace(/LargeContent/g, '../../LargeContent');
+      manifest = manifest.replace(/LargeContent/g, '../../../LargeContent');
       fs.writeFileSync(filePath, manifest);
       if (CloudRunner.buildParameters.cloudRunnerDebug) {
         CloudRunnerLogger.log(`Package Manifest`);
diff --git a/src/model/cloud-runner/services/cloud-runner-custom-steps.ts b/src/model/cloud-runner/services/cloud-runner-custom-steps.ts
index 8e2737f8..dec8d010 100644
--- a/src/model/cloud-runner/services/cloud-runner-custom-steps.ts
+++ b/src/model/cloud-runner/services/cloud-runner-custom-steps.ts
@@ -8,6 +8,7 @@ import path from 'path';
 import * as fs from 'fs';
 import Input from '../../input';
 import CloudRunnerOptions from '../cloud-runner-options';
+import CloudRunnerLogger from './cloud-runner-logger';
 
 export class CloudRunnerCustomSteps {
   static GetCustomStepsFromFiles(hookLifecycle: string): CustomStep[] {
@@ -141,6 +142,9 @@ export class CloudRunnerCustomSteps {
 
     // }
     const isArray = steps.replace(/\s/g, ``)[0] === `-`;
+    if (CloudRunner.buildParameters?.cloudRunnerDebug) {
+      CloudRunnerLogger.log(`Parsing: ${steps}`);
+    }
     const object: CustomStep[] = isArray ? YAML.parse(steps) : [YAML.parse(steps)];
     for (const step of object) {
       CloudRunnerCustomSteps.ConvertYamlSecrets(step);