From 2afd9cd86f6f5f76f46578659fb082d1a6a7eca3 Mon Sep 17 00:00:00 2001
From: Andrew Kahr <22359829+AndrewKahr@users.noreply.github.com>
Date: Wed, 15 Nov 2023 06:17:55 -0800
Subject: [PATCH] Additional Fixes and Improvements (#596)

- Windows now exits with the proper exit codes. This mirrors Ubuntu behavior properly now and means we do not need the error parsing logic to handle error conditions which means we should be back to v2 behavior.
- Allow customizing image registry/image version
- Only create the licensing directory on Mac if it doesn't already exist. Don't delete the folder on build complete. This means builds nominally shouldn't need sudo permissions, very useful for self-hosted runners.
- Pick correct architecture when installing macos editor to support both x86 and arm-based systems (Credit @dcvz)
---
 action.yml                            |   8 +++++++
 dist/index.js                         | Bin 22176169 -> 22177358 bytes
 dist/index.js.map                     | Bin 14646880 -> 14648317 bytes
 dist/platforms/mac/entrypoint.sh      |  10 +++++---
 dist/platforms/windows/build.ps1      |  23 ++++++++++--------
 dist/platforms/windows/entrypoint.ps1 |  10 ++++----
 src/model/build-parameters.ts         |   4 ++++
 src/model/docker.ts                   |   2 +-
 src/model/exec-with-error-check.ts    |   4 ++--
 src/model/image-tag.test.ts           |  15 ++++++++----
 src/model/image-tag.ts                |  17 ++++++++-----
 src/model/input.ts                    |   8 +++++++
 src/model/platform-setup/setup-mac.ts |  33 +++++++++++++++++++++++---
 13 files changed, 101 insertions(+), 33 deletions(-)

diff --git a/action.yml b/action.yml
index 2ada25e6..989c2569 100644
--- a/action.yml
+++ b/action.yml
@@ -124,6 +124,14 @@ inputs:
       'Isolation mode to use for the docker container. Can be one of process, hyperv, or default. Default will pick the
       default mode as described by Microsoft where server versions use process and desktop versions use hyperv. Only
       applicable on Windows'
+  containerRegistryRepository:
+    required: false
+    default: 'unityci/editor'
+    description: 'Container registry and repository to pull image from. Only applicable if customImage is not set.'
+  containerRegistryImageVersion:
+    required: false
+    default: '3'
+    description: 'Container registry image version. Only applicable if customImage is not set.'
   allowDirtyBuild:
     required: false
     default: ''
diff --git a/dist/index.js b/dist/index.js
index 2bdb48110f7821d8198adbf28e6cc2fde896f6d4..dc3aac42a703b775526b6293e055ff2f7be75896 100644
GIT binary patch
delta 2323
zcma*nX;f5Y7{Ku}a0eY2mSJ@iWYj?hgh5;oP*lWyLA0{P(ncI%R2F9`NlQ!1TuO`T
zwaC<VGgB*@78lAEEwjZeGfmCHEi_xzHvf;v5!2)8!|(rL?)yIXy?5r!ip^Vtw{P1T
zyvCNTmezzDdW>|IxIA8W)ktS$g~#Qsa98D8T;-KM@7PTHc;^I%Z?e~3Tv6_IxXPXG
z|17TVmD4h`@v}i?juL0Jv8y@ulI0DTGCRl2vSrV)W$O^&w`B*e+^xo215N&ek=l${
zwRyHaN+nvu4QkoWz-B7FPBZ(Lq-c}!^3p7qjJ$B%%UnEnzfn%N$5m0D=5Jo2_0_ey
z!UVskRLcoSD)g0&bGmJpENnV0#lLEz<~8~4)3pux)wPGUE6r7=b(*z0WUnEz@f}?_
zwVJYPQ;ZCVx$OPah&GmZRkT`*kp0n(`<ou++ywuz4cd?-wZIq@s@B(P5vpK|-m2<T
zmm5`Wl|fU99W=dv(n0M^K*O4XxyvHek<{f84VO=ivc#yxby|fn-(6hl@;ZyXKDSei
zS*yiWXY2@4MW^-ppoULX;UUdptaMitJ3St|gXL;X`;D=IQ?t6L15sL($`}!(x1XPo
z?=JC`Im^BFN}s3HmYkk0>l?=>r&*GxW@n9M<CFwXwAz12GwU7hvZjO5|L>rNeT{RX
z)S?;d&8p+R0F&A?v(^~j^uD<k>$Ho`A8}MmjBdK3@!0;8b=tg(pWaljnd9=CJVlYi
z?I?44`H|WD6YDjDF3fH}_gc<BrhoKtEkvhQ*J=ru`%>oAoY0_05SpPm3<yRDj0i;-
z!Vv)zA`yjX#2^-NXaO@?q7~wifYwNa1#Qq4?O;U`+9Me@q#zX?kcM>Fk%5lLL??7c
z7j#7yx*;1m$VGSbKpuLc7kVQfeNceD=!gCofPol<!5D&}7=}U&M-fI~B(B2MxCWze
zEw01$xB;VaBW}VNjK$4xU>u4u9!^X^2}<F@L`=eDl%X6IsKgYw;ei)E+=5#%6;-$m
z(=Z*k;||QgOx%gPFblJBH}1h4+>5!Ghxu55`*1%NVi6v|gQ&(sco>gBVKE-XW2nL7
zSb`_86w9z2PvR*&jc4#Ip2PE4ffuk6FJcv5!fLF+TD*)`@G92fHTdy5-oTr93+u4~
z8?gzscpL9vGv38}cpo2N3%24ze1vWI7~Am)KE-GF96Rs@cH&EXg<bd>yYUV7U@yMK
zKJ3Q<e20Vh9zUQChj182a1_VzBkFM+C-4(a;%EGVU-27$#~(O_(>Q}a@fZHaKlpck
z%?aH?NCG5*5>29)1WB4nnoA6lU`dF?C<&E>Nx~%&5|boS5+#Y2#7JT#agr7iv!tb@
zl_Xx0AZaa0lvpHfByA<_Bvwh1q`f3rVw0puQY9TEX_9n_U6LW`D9My`l601Ik#v=0
zNxDh0B{`B@Nq0#PNuH#qq?e?(Bwx};QXuIo=_lzg86X)b86+7j86p`f873)|43`w?
LHt~O=3v-_ZFRqz-

delta 1656
zcmZwHSy+?>6o>I=m~R*vQ5Zo6a2pjIL<AI-K}A7u#f7xAy-X&Y)EOH-DmB}zsI<(s
zFD<u9jchS9zgDSi!%SNZZL`I)Y*Q(;P2YdlUHsnXT%6}zo;|ypJ&ik?JzH{uOIm^r
zEkOt3?3SQ&^8u$BtG63cjAdyCQ^+cuAMdlO_c`6xF2BoTm*pA@OYOE=qtcNOsE>rr
z1+&5d>(mUF&mF1>o6%Uno*p(z;v7ZxwmF9BO)SV-WX=xP<ws`D3)z9i#*T7(Z<A4#
zZ5@nrxxIP*aBU<S3r!7~^|44rw8lzqbf?<2hYY9lzYWXV=uWXR*RSwck?sB@YwKYn
zYG)iV%y?`6QR9TwcFZ`Q?yn2a4MoiVKh{v(YQTkfxX}&?@Sr^s(E%Nigk*Tp2`NZL
zXQaW0bYvhCUC<TX&>cPCM^E%ZZ)71GeGotn`XU$okca-rM*#{k00U8kK^Tl7C`J$^
z7>Z#Sj#7-kNR*)*qfmiLjK&y@#W;+|1XN)nCSfwBpc-djDyHE~oQ3I_fwOTA&c%5+
z9~a<4T!f1;6PI8XY7oMusKsoAaT(@dF6JSEDCXmG#83wl^|%68;wmh_LM+17Sd43M
zEw01$xB*LWBW}XYXuvJF6}Mq2mf?2Xf#tXpD{vR?#yz+f_rb#bScz4501sj{)?h8x
zVLcwg!*~Q6uo0W^C>rq?Hsf(TfhX}4w%}=O#WUE3XR#eNp2PEa0Wabuyo?=a!Yg<c
zuVE)%#~XMPZ{ck;V;A1RZoG><*o*h@K0d&Q_y`|kA3i|~_TvCP#b@{&U*Jm|#8>zl
z-{4yu!gu%{hw%e`#1Z_2pYaQR#cw!@V>pgh{Ek1+h7&l6Kk*m-#y|KMr<NACI+jC;
zQ=E#SxRiLst+Z1T6pzwgNmM#09hD>{S@9~JloTaZ>8zwFJ|$hrP%@P+N>`<u(p~AH
z_?4bYFQvDVrDQ98lz@_>^i^_|eoCIwU&&VrltN{IGEgZ}1}TG;Axg0lR7#Yg$}nZP
vQmTwlMk-}WxiU(rP%4$t${1y=GENz<Oi-$niOM8pvNA=fb~N!%9KP6T%|alb

diff --git a/dist/index.js.map b/dist/index.js.map
index a47bee96390487d203ced5cde8db5fbb83978c6e..6f16cb34d7228988949499d3aa0c00a6b3e1ff10 100644
GIT binary patch
delta 2063
zcmb8uc~F#P9Ki8e7Z%v%-UW}nUPMC@S3n~}P0%E7Inpu@T<8@xWf%8Ih*a<Z%gO`e
zNkc^~J5>zxt*k_i%uK^jE2Xsm`omGDnT|ig`hqd6($w_FXXcsbcRau6dFQ?QM~9}P
z=9Z>$YLM7?I6O+UUXBb9+K`yvYd5O2qC%xQ-nmc?<o3O$-jr=onhgORs)N}{s@lqG
zT~k5ip`yAgYMt<$)Nc``?doM@>uPVU%M;R1Y@08t`)<mv>uPaxW>lD}Gpy8~Rv%F{
zWwgYqI|HJ4mp-j)k*tf}*PS}FGgaG^yJ{`RmWj$UDxEmx2;H%|vbv_ST7^DPBLIQW
zAPB(-ffhQ1A`Ib(KqR6N4LuBqK`i>BANnhm)dTX{Me7`MfXG;$8rVNqE^>Ih?($r@
z)a7w_UGDO9$>A*ZdBwutECzk=aFWRU)uI<SeW@B_cXV=zy-1!dyFCt<)4x3Ijs(##
z-`KCFt-uHq%&;hJ1=j1qqA6c8DCZYj+hVng>`OdyqEs=@Epjfz#Ryl{NR4uOmGxZ4
z*d(dY<@DMePTAevxo7Tw2>Q>Jq|~3VE>Ic&rGql4#X6(U;2FM>0@*#JSE7HnM8$K`
z+7zvfxMU5UC>p{{VNty%5>;u&eqy0PiWKw0O(D^}63Ru&FJ^<tHkou{ZiFf1uIGx3
zm26#=hVDxL32xU)S;in`v{fn@EcVuN(2Y1rFDf=SYDIo?e5klFJWeADS}d`m(QXP5
z?Kx71m^EHX5aS{&(RKT!D8-T`{j9oOyYpy#u()0;MGI$(MSHu#xzeZ=*Q&-uh^$G{
ziqK4VVX?z27kYheS!|Dz28h;eCXLSCvn|3WOY!1rV_a}R=dSp%-eeHX>)QiWWg<nE
zxNV|2FtsON&U6>~N@S<kR_gN<4@np{%&(c8kR&CPjY`W;8!48qHtR*@R&$_em?9a~
zc6Uinzm)&ekIK8-#fS~_H;0I`E*`I07q1tsQzfm%e~@%(P(`WRRVaHrw$A<KHeugw
zG>K%jDd>*tCr^_GD#s>CS2gMW_1(AhNMofu+3PEvZZEVI$=*!A$+PWldx`AjHxl*<
z<``wyOestiYqND7*!}8%Hxf~Mn00@)^ryJ6!2BQIy@v0OI1EHQ24OJnK>~&#5%*#!
zk}wQ53`a6jkctr)iTjX-`!Na+ARVJI24nFc#vucl7>@~f2osTohcOA0F$GgG4bw3L
zGm(uP<RTA`U>0WMQ9On@cpP&v5A(4A`B(@$3Q&kAAY&1VPz(p2#9}N#37l}D6ieZT
z2VVH_6qcb3<#-wucm~U{0xMC8Dy+h4tif7TqXz5nES|%9JdYRfA~s+nHeoYru>~)o
z4gxP@E4JYk)MGn#U?&=|3%jugui`cA#p`$jZ{jVyjd!pQ`*8q`IEZ)AghO}_hoRto
ze1H#e1RvpJe1fBB#xWen34Dqce1?<w9H;OFPUB0Q!C8ETR-D7vXv2A2z(st6Z}A;2
R;WFCsJ$_KybFQpO`U|%LlTH8t

delta 1394
zcma*iYf#ix7{~GXv$%`9%ia{0H2eQCgcMTCv@)*=-q6~-(bXV#!%cRfy%dHfg0^Cz
zY=kE(vx}ux>gHM}vjjCZHPJH7Of6>WMNCsO`J!wlvhRZVx)-0B^E~G{zh_Q&<R5+K
z-`)CHu|c#|J56H0F7r}zlVTK?cA5_+4|4Ng)?6jt+5S^XPnl6|nUJ!f!|}7Q9aB={
z6}CO)QCFXyC#4BzON*8|IO>{DZ4wh_*!M+UE>YFsG|7&$8D=Hfj{9rkslv9`VG{PB
zIbSq&rQ5|}lOuL@Zdh{8D7OA?9Yb_HRyR}ETpBis2A{Q1bQT-STH4Hi_9k>$ojang
zsaK1N{}#{P?J4Swu}yPs>Ahe7t1dU0EH4LbhUAxi)FsP$OEhAMDoBA2sptbe3`j#?
z7-51L>9D{G8|-kPANnH$nQ$Tt*GNlrK<UXyj(Z@k#UNZKbKL50X=2$5ElcM6)Z>}D
zP#`S3>(z^sWI?;SP)W-R`@Ny1i@f51Z%{wcRHvrtJ#KHPGSJhIGNF!3QAWwEBWm1X
z9+6WMTI>xD_m}xR^5{9WZ;?Eat@(yzX+dv=#~&)tyygDNfM<>;6b|^ORJui@mT-zq
zyT%$sZHe}W=ql9mgtba_2v<zA%k$H<i;CgOW3f(4WQx|>fkt5~)*5B&Z0&+x{xVNX
zS48##?ehOv5@89lF&Nh)2SbpHJluex7>0Zl;6@C`2#mx{xEZ5x3r1rMZpCf59b<6^
z#$h}rU?L`AGVa6_6ru=IF%8o(12a*KS(uHxa5r4I2XinN^DrL^P=b4LAMVEkcn}X^
zAs$94%J2vl!3_@{ML8D3i^s4874X52N>t%-1Q0|BVLX8+QH`Z|3N=`U<#-w^P>YqQ
zLp@euHJ(8PYtVqTcoxs05$muXO^D)oG~)%dU;_kR#74Y?m+=ZV;Z<zLYj_=R;7x47
zTX-8=u?^et4&KFk*nyqcg&5w)Zp5(%AK*hse1yID82j)EKE-~tq74Ud5Qp#?+L6HL
uIE*7WiZ5^s9XO5?_!3{?B)-NeoW?gegKu#b-{Bn2;{v{ywIx3+FZdVN{!o_y

diff --git a/dist/platforms/mac/entrypoint.sh b/dist/platforms/mac/entrypoint.sh
index 37cf7a4b..80ec6d09 100755
--- a/dist/platforms/mac/entrypoint.sh
+++ b/dist/platforms/mac/entrypoint.sh
@@ -4,8 +4,13 @@
 # Create directories for license activation
 #
 
-sudo mkdir /Library/Application\ Support/Unity
-sudo chmod -R 777 /Library/Application\ Support/Unity
+UNITY_LICENSE_PATH="/Library/Application Support/Unity"
+
+if [ ! -d "$UNITY_LICENSE_PATH" ]; then
+  echo "Creating Unity License Directory"
+  sudo mkdir -p "$UNITY_LICENSE_PATH"
+  sudo chmod -R 777 "$UNITY_LICENSE_PATH"
+fi;
 
 ACTIVATE_LICENSE_PATH="$ACTION_FOLDER/BlankProject"
 mkdir -p "$ACTIVATE_LICENSE_PATH"
@@ -21,7 +26,6 @@ source $ACTION_FOLDER/platforms/mac/steps/return_license.sh
 # Remove license activation directory
 #
 
-sudo rm -r /Library/Application\ Support/Unity
 rm -r "$ACTIVATE_LICENSE_PATH"
 
 #
diff --git a/dist/platforms/windows/build.ps1 b/dist/platforms/windows/build.ps1
index e8727618..751cf9d2 100644
--- a/dist/platforms/windows/build.ps1
+++ b/dist/platforms/windows/build.ps1
@@ -156,26 +156,29 @@ $unityArgs = @(
 # Remove null items as that will fail the Start-Process call
 $unityArgs = $unityArgs | Where-Object { $_ -ne $null }
 
-$process = Start-Process -FilePath "$Env:UNITY_PATH\Editor\Unity.exe" `
+$unityProcess = Start-Process -FilePath "$Env:UNITY_PATH\Editor\Unity.exe" `
                          -ArgumentList $unityArgs `
                          -PassThru `
                          -NoNewWindow
 
-while (!$process.HasExited) {
-    if ($process.HasExited) {
-      Start-Sleep -Seconds 5
+# Cache the handle so exit code works properly
+# https://stackoverflow.com/questions/10262231/obtaining-exitcode-using-start-process-and-waitforexit-instead-of-wait
+$unityHandle = $unityProcess.Handle
+
+while ($true) {
+    if ($unityProcess.HasExited) {
+      Start-Sleep -Seconds 3
       Get-Process
 
-      Start-Sleep -Seconds 10
-      Get-Process
+      $BUILD_EXIT_CODE = $unityProcess.ExitCode
 
       # Display results
-      if ($process.ExitCode -eq 0)
+      if ($BUILD_EXIT_CODE -eq 0)
       {
           Write-Output "Build Succeeded!!"
       } else
       {
-          Write-Output "$('Build failed, with exit code ')$($process.ExitCode)$('"')"
+          Write-Output "Build failed, with exit code $BUILD_EXIT_CODE"
       }
 
       Write-Output ""
@@ -187,8 +190,8 @@ while (!$process.HasExited) {
       Get-ChildItem $Env:BUILD_PATH_FULL
       Write-Output ""
 
-      exit $process.ExitCode
+      break
     }
 
-    Start-Sleep -Seconds 5
+    Start-Sleep -Seconds 3
 }
diff --git a/dist/platforms/windows/entrypoint.ps1 b/dist/platforms/windows/entrypoint.ps1
index f156863d..07cbb070 100644
--- a/dist/platforms/windows/entrypoint.ps1
+++ b/dist/platforms/windows/entrypoint.ps1
@@ -12,16 +12,18 @@ regsvr32 C:\ProgramData\Microsoft\VisualStudio\Setup\x64\Microsoft.VisualStudio.
 Get-Process -Name regsvr32 | ForEach-Object { Stop-Process -Id $_.Id -Force }
 
 # Setup Git Credentials
-& "c:\steps\set_gitcredential.ps1"
+. "c:\steps\set_gitcredential.ps1"
 
 # Activate Unity
-& "c:\steps\activate.ps1"
+. "c:\steps\activate.ps1"
 
 # Build the project
-& "c:\steps\build.ps1"
+. "c:\steps\build.ps1"
 
 # Free the seat for the activated license
-& "c:\steps\return_license.ps1"
+. "c:\steps\return_license.ps1"
 
 Start-Sleep -Seconds 3
 Get-Process
+
+exit $BUILD_EXIT_CODE
diff --git a/src/model/build-parameters.ts b/src/model/build-parameters.ts
index 4cd8a523..a91e165e 100644
--- a/src/model/build-parameters.ts
+++ b/src/model/build-parameters.ts
@@ -44,6 +44,8 @@ class BuildParameters {
   public dockerCpuLimit!: string;
   public dockerMemoryLimit!: string;
   public dockerIsolationMode!: string;
+  public containerRegistryRepository!: string;
+  public containerRegistryImageVersion!: string;
 
   public customParameters!: string;
   public sshAgent!: string;
@@ -170,6 +172,8 @@ class BuildParameters {
       dockerCpuLimit: Input.dockerCpuLimit,
       dockerMemoryLimit: Input.dockerMemoryLimit,
       dockerIsolationMode: Input.dockerIsolationMode,
+      containerRegistryRepository: Input.containerRegistryRepository,
+      containerRegistryImageVersion: Input.containerRegistryImageVersion,
       providerStrategy: CloudRunnerOptions.providerStrategy,
       buildPlatform: CloudRunnerOptions.buildPlatform,
       kubeConfig: CloudRunnerOptions.kubeConfig,
diff --git a/src/model/docker.ts b/src/model/docker.ts
index 77645666..50cbf69f 100644
--- a/src/model/docker.ts
+++ b/src/model/docker.ts
@@ -15,7 +15,7 @@ class Docker {
     // eslint-disable-next-line unicorn/no-useless-undefined
     options: ExecOptions | undefined = undefined,
     entrypointBash: boolean = false,
-    errorWhenMissingUnityBuildResults: boolean = true,
+    errorWhenMissingUnityBuildResults: boolean = false,
   ) {
     let runCommand = '';
     switch (process.platform) {
diff --git a/src/model/exec-with-error-check.ts b/src/model/exec-with-error-check.ts
index 3240a07d..3fe3030b 100644
--- a/src/model/exec-with-error-check.ts
+++ b/src/model/exec-with-error-check.ts
@@ -1,10 +1,10 @@
-import { getExecOutput, ExecOptions } from '@actions/exec';
+import { ExecOptions, getExecOutput } from '@actions/exec';
 
 export async function execWithErrorCheck(
   commandLine: string,
   arguments_?: string[],
   options?: ExecOptions,
-  errorWhenMissingUnityBuildResults: boolean = true,
+  errorWhenMissingUnityBuildResults: boolean = false,
 ): Promise<number> {
   const result = await getExecOutput(commandLine, arguments_, options);
 
diff --git a/src/model/image-tag.test.ts b/src/model/image-tag.test.ts
index 77934e5d..47adf65e 100644
--- a/src/model/image-tag.test.ts
+++ b/src/model/image-tag.test.ts
@@ -5,11 +5,11 @@ describe('ImageTag', () => {
     editorVersion: '2099.9.f9f9',
     targetPlatform: 'Test',
     builderPlatform: '',
+    containerRegistryRepository: 'unityci/editor',
+    containerRegistryImageVersion: '3',
   };
 
   const defaults = {
-    repository: 'unityci',
-    name: 'editor',
     image: 'unityci/editor',
   };
 
@@ -21,8 +21,7 @@ describe('ImageTag', () => {
     it('accepts parameters and sets the right properties', () => {
       const image = new ImageTag(testImageParameters);
 
-      expect(image.repository).toStrictEqual('unityci');
-      expect(image.name).toStrictEqual('editor');
+      expect(image.repository).toStrictEqual('unityci/editor');
       expect(image.editorVersion).toStrictEqual(testImageParameters.editorVersion);
       expect(image.targetPlatform).toStrictEqual(testImageParameters.targetPlatform);
       expect(image.builderPlatform).toStrictEqual(testImageParameters.builderPlatform);
@@ -53,6 +52,8 @@ describe('ImageTag', () => {
       const image = new ImageTag({
         editorVersion: '2099.1.1111',
         targetPlatform: testImageParameters.targetPlatform,
+        containerRegistryRepository: 'unityci/editor',
+        containerRegistryImageVersion: '3',
       });
       switch (process.platform) {
         case 'win32':
@@ -68,6 +69,8 @@ describe('ImageTag', () => {
         editorVersion: '2099.1.1111',
         targetPlatform: testImageParameters.targetPlatform,
         customImage: `${defaults.image}:2099.1.1111@347598437689743986`,
+        containerRegistryRepository: 'unityci/editor',
+        containerRegistryImageVersion: '3',
       });
 
       expect(image.toString()).toStrictEqual(image.customImage);
@@ -77,6 +80,8 @@ describe('ImageTag', () => {
       const image = new ImageTag({
         editorVersion: '2019.2.11f1',
         targetPlatform: 'WebGL',
+        containerRegistryRepository: 'unityci/editor',
+        containerRegistryImageVersion: '3',
       });
 
       switch (process.platform) {
@@ -93,6 +98,8 @@ describe('ImageTag', () => {
       const image = new ImageTag({
         editorVersion: '2019.2.11f1',
         targetPlatform: 'NoTarget',
+        containerRegistryRepository: 'unityci/editor',
+        containerRegistryImageVersion: '3',
       });
 
       switch (process.platform) {
diff --git a/src/model/image-tag.ts b/src/model/image-tag.ts
index 35b4bbeb..cf484708 100644
--- a/src/model/image-tag.ts
+++ b/src/model/image-tag.ts
@@ -2,7 +2,6 @@ import Platform from './platform';
 
 class ImageTag {
   public repository: string;
-  public name: string;
   public cloudRunnerBuilderPlatform!: string;
   public editorVersion: string;
   public targetPlatform: string;
@@ -12,7 +11,14 @@ class ImageTag {
   public imagePlatformPrefix: string;
 
   constructor(imageProperties: { [key: string]: string }) {
-    const { editorVersion, targetPlatform, customImage, cloudRunnerBuilderPlatform } = imageProperties;
+    const {
+      editorVersion,
+      targetPlatform,
+      customImage,
+      cloudRunnerBuilderPlatform,
+      containerRegistryRepository,
+      containerRegistryImageVersion,
+    } = imageProperties;
 
     if (!ImageTag.versionPattern.test(editorVersion)) {
       throw new Error(`Invalid version "${editorVersion}".`);
@@ -23,8 +29,7 @@ class ImageTag {
     this.customImage = customImage;
 
     // Or
-    this.repository = 'unityci';
-    this.name = 'editor';
+    this.repository = containerRegistryRepository;
     this.editorVersion = editorVersion;
     this.targetPlatform = targetPlatform;
     this.cloudRunnerBuilderPlatform = cloudRunnerBuilderPlatform;
@@ -33,7 +38,7 @@ class ImageTag {
     this.imagePlatformPrefix = ImageTag.getImagePlatformPrefixes(
       isCloudRunnerLocal ? process.platform : cloudRunnerBuilderPlatform,
     );
-    this.imageRollingVersion = 3; // Will automatically roll to the latest non-breaking version.
+    this.imageRollingVersion = Number(containerRegistryImageVersion); // Will automatically roll to the latest non-breaking version.
   }
 
   static get versionPattern(): RegExp {
@@ -156,7 +161,7 @@ class ImageTag {
   }
 
   get image(): string {
-    return `${this.repository}/${this.name}`.replace(/^\/+/, '');
+    return `${this.repository}`.replace(/^\/+/, '');
   }
 
   toString(): string {
diff --git a/src/model/input.ts b/src/model/input.ts
index 94a0f2b4..85f45733 100644
--- a/src/model/input.ts
+++ b/src/model/input.ts
@@ -256,6 +256,14 @@ class Input {
     return Input.getInput('dockerIsolationMode') || 'default';
   }
 
+  static get containerRegistryRepository(): string {
+    return Input.getInput('containerRegistryRepository')!;
+  }
+
+  static get containerRegistryImageVersion(): string {
+    return Input.getInput('containerRegistryImageVersion')!;
+  }
+
   public static ToEnvVarFormat(input: string) {
     if (input.toUpperCase() === input) {
       return input;
diff --git a/src/model/platform-setup/setup-mac.ts b/src/model/platform-setup/setup-mac.ts
index d529d21f..70ce06f8 100644
--- a/src/model/platform-setup/setup-mac.ts
+++ b/src/model/platform-setup/setup-mac.ts
@@ -47,7 +47,10 @@ class SetupMac {
 
     // Ignoring return code because the log seems to overflow the internal buffer which triggers
     // a false error
-    const errorCode = await exec(command, undefined, { silent, ignoreReturnCode: true });
+    const errorCode = await exec(command, undefined, {
+      silent,
+      ignoreReturnCode: true,
+    });
     if (errorCode) {
       throw new Error(`There was an error installing the Unity Editor. See logs above for details.`);
     }
@@ -64,7 +67,9 @@ class SetupMac {
   private static async getLatestUnityHubVersion(): Promise<string> {
     // Need to check if the latest version available is the same as the one we have cached
     const hubVersionCommand = `/bin/bash -c "brew info unity-hub | grep -o '[0-9]\\+\\.[0-9]\\+\\.[0-9]\\+'"`;
-    const result = await getExecOutput(hubVersionCommand, undefined, { silent: true });
+    const result = await getExecOutput(hubVersionCommand, undefined, {
+      silent: true,
+    });
     if (result.exitCode === 0 && result.stdout !== '') {
       return result.stdout;
     }
@@ -72,6 +77,23 @@ class SetupMac {
     return '';
   }
 
+  private static getArchitectureParameters(): string[] {
+    const architectureArgument = [];
+
+    switch (process.arch) {
+      case 'x64':
+        architectureArgument.push('--architecture', 'x86_64');
+        break;
+      case 'arm64':
+        architectureArgument.push('--architecture', 'arm64');
+        break;
+      default:
+        throw new Error(`Unsupported architecture: ${process.arch}.`);
+    }
+
+    return architectureArgument;
+  }
+
   private static getModuleParametersForTargetPlatform(targetPlatform: string): string[] {
     const moduleArgument = [];
     switch (targetPlatform) {
@@ -111,6 +133,7 @@ class SetupMac {
 
     const unityChangeset = await getUnityChangeset(buildParameters.editorVersion);
     const moduleArguments = SetupMac.getModuleParametersForTargetPlatform(buildParameters.targetPlatform);
+    const architectureArguments = SetupMac.getArchitectureParameters();
 
     const execArguments: string[] = [
       '--',
@@ -119,12 +142,16 @@ class SetupMac {
       ...['--version', buildParameters.editorVersion],
       ...['--changeset', unityChangeset.changeset],
       ...moduleArguments,
+      ...architectureArguments,
       '--childModules',
     ];
 
     // Ignoring return code because the log seems to overflow the internal buffer which triggers
     // a false error
-    const errorCode = await exec(this.unityHubExecPath, execArguments, { silent, ignoreReturnCode: true });
+    const errorCode = await exec(this.unityHubExecPath, execArguments, {
+      silent,
+      ignoreReturnCode: true,
+    });
     if (errorCode) {
       throw new Error(`There was an error installing the Unity Editor. See logs above for details.`);
     }