From 2b57efdf8ea97aaa988728a11f32c122441cc158 Mon Sep 17 00:00:00 2001
From: Andrew Kahr <22359829+AndrewKahr@users.noreply.github.com>
Date: Mon, 16 Oct 2023 21:40:12 -0700
Subject: [PATCH] Setup memory/cpu limits for windows containers

---
 action.yml                    |  10 ++++++++++
 dist/index.js                 | Bin 22170784 -> 22171658 bytes
 dist/index.js.map             | Bin 14640020 -> 14641012 bytes
 src/model/build-parameters.ts |   8 ++++++--
 src/model/docker.ts           |  13 ++++++++++++-
 src/model/input.ts            |  11 +++++++++++
 6 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/action.yml b/action.yml
index ef48e8c2..47864bb2 100644
--- a/action.yml
+++ b/action.yml
@@ -106,6 +106,16 @@ inputs:
     default: ''
     description:
       'User and optionally group (user or user:group or uid:gid) to give ownership of the resulting build artifacts'
+  dockerCpuLimit:
+    required: false
+    default: ''
+    description: 'Number of CPU cores to assign the Windows docker container. Defaults to all available cores.'
+  dockerMemoryLimit:
+    required: false
+    default: ''
+    description:
+      'Amount of memory to assign the Windows docker container. Defaults to 75% of total system memory rounded down to
+      the nearest gigabyte.'
   allowDirtyBuild:
     required: false
     default: ''
diff --git a/dist/index.js b/dist/index.js
index 9c38ab9a4a1f029e5c7d868a1ef046fee08cbb15..a06da8b046df94b42598a2edec6cb29e25a00c42 100644
GIT binary patch
delta 2025
zcmaLW2~bpZ9Ki8e_5p$*q97oG4_IIq*o9p#0TB@dQ4sC2gMt;7LxEjksR+o@3Xh76
z>P44ySazcwn{?P+blQC%(xF{yW%v30MN^P7?ab#p^XC8lzyE*U%nlBW_-`5<@gIt}
zt*vv`u6DE)xjM?5TAJLsYE!GL!(DB))H&+y9nEgb#Pt+^b=+@kt-{gbZ0r2r?c-jV
zIKj0(!Pc8#)4|J=VAK2UGo+~hIr8u4@iRQB5lXC=wjxqV);2^cW!lC_CEVkRR1WBh
z&E{HHM|-}ZYvPz5wQ9oM&E}TB?)}e;<L38xDx;L-bv~`mI!Cor(-rEHytC7?tTxR)
zpwH7P?LNMqom&-GSpU#2C2+zynl*EFs8+pA3Cc*Eu;5NKsomY`*vR&AA6RZ{G+CM*
ztqtx*?O?hREmMQXHjlehe_>pRHgqUV2`FnVZECQu>~uTSd~HjecZjxQyP{Sfv19DS
z8beow-Q8%ZZ+1G{jK(7`;C8z0&3p`_NljH{YWu$jnA9XS&61sI>M8Ay;e5jyy{gru
z=#}0QkMM>Md@%`r@W*5XAP`d!gsBL|G)zYbLNNnj2uB2FA`-I@g=ox%iWtNq4hF;{
z0f{iegd`**1!h=~iZobZLpm~$i7aGe4swu-Jj_Kt=Ai)dQHTX7LNOMi1f^JnGAzat
zl%oPmQHf<(j-zlij=`}w4l8gxPQZyc2~{{5r=S`&uwx}^Q3nU=(SSxYVHH-R87*jq
z6E3Vl8`|MU2TsLlI31lh16}Aw56;9|oQ1Qo4(o9a&c%7?#RhD|CTzy}xBwTT4;Ntz
zE=E5t!KJti8ZO5GuE3SJ3RmMAY{ek1#dWwIH((oX#7)?an{f+n#cjA9ci>J8VFz~N
zF5HcKa4$T#54$`io?%<Eo`1V$tvZ~e?b$!<r}ga}_SQLj?W4oE9}nO`JcQkN7?0pl
zJch^d1fIlGcp4*k2G8O-JdYRfBKF`Vyo^`yDqh3ucmr?ZExe6)@GjoN`}hDKVlPJV
z5kAHz_!RrFAD`iKe1R|V6%ODa4&iHjgKu#d-{E`wfFJP_e#S5O6~Ezk{IS_Ss_TQq
zOQM%35^sr*#8)y&;wSN!OqK*l0wq%<L6WJGV97MebV-OLR5C*nCJC2BNM=eRC9@<^
zl4!|ni7JVa#7g2M21&dmL6RsjN=%X@NwOqGVwPAWsgg8_RbrE*OEM&xk}OHKWR4_9
zk}JuR%$4Lz=1B@9^Cg9n1(G63v1Fm7L{chQBq@_DmMoE!ODZHwC6$t8y508C<+_4Z
Fe*)?wgJ=K%

delta 1496
zcmWm4XIu;b0EY43<&2J!k;DlR38|x~L<ymgz4zW*_9#RlJ6p-#`zU*7?>!^gd++D{
z@P9r%v59G>#6@YQZElw6WJ^r4#Q+;?vL%Zt(|Xz2=xSr_Xg1o}SP#1x%~1(s91Y&q
z@FZiT)7-?fzZ1gDwzdgg$BgzdfvHAhMK)wd4%otkoX7<`=*<lW<UwBKLw-1-0Gv<|
z&M1V!Frx@uP!z>b9IhyVl5j&Ql!iOXzyoDb4&~vA3h;tAEU1V|@PRKXqYC`sj{sCf
zAgZA{f)I=v2tiHMLT!Yi4(g&F!Vr%7Xn=-@KqE9p6EsCLG)D`xL@TsL8?;3`v_}VY
zL??7c7j#88bVm>LL@)G4AM`~(^v3`U#2^gD5DdjI3`ZnJU?fIiG{#^o#$h}rU?QRr
zjY*h{DTu*TOhYW<FdZ{66Y-dZ*_ea5n1}gTfCMbWA}q!dEX6V`#|k7O2`iC|RalKR
zSc`R7j}6#}P1uYr*otk~jvd&EUD%C1uwpOvSp!p3LOf#9Gg6R>{WySwIE2GEf}=Qw
z<2ZqnIEB+l!x@~#Ih@A@T*M_@#uZ$}HC)FH+{7*1#vR<nJ>16wJj5eBMmnD0DKhX3
znRt#Dc!^hdjW>9UcX*Ev_=r#Vj4$|#Z}^TM_=#WmjX(H{e{ty<hIlA8N*2YaWL2^$
z*_9lMtzuGgD!CLp#a_v+I4F6Pyh=VLzv8GAP@I&4inCHkDXf^4B8rPrR4JwuS6r16
zN=d~{DW#NF+?6tlhf-E4r<7Mbl?sZN;;mSeib^HLNAXoED^(Of#a{_fsw#m>HKn=|
qqy#H9ln|w+QcJ0=gerBEx=KAIObJ)&D-D!}N`&E1dPXCId++}j_Z!dv

diff --git a/dist/index.js.map b/dist/index.js.map
index 2e82038a1b0e713ab31c8f43e0603803e1878ea1..6da9eaff322bea525a09608dcb19844275cffe97 100644
GIT binary patch
delta 1640
zcmaLWYfw~W9LMp2g*DlQUE~%la!vuUi?D)0CPq@2WJ)e2l}2%0F0s1@mZcydAc|G9
zbVGf@H0_>Rih-T7@RF5LNOZBJvV7A_FM89|H2K1&?@E^?XF4;VbDrls=luTv^URzr
zCogD!ow%SK+MyN4&d!b$MtyjQXg{NI_-q?R&!M>Sfu1>G>e{Zjun;kHB1$*BL4Ur&
zXETW1hYdQBxG!R!u$|WA`cFM#^N|?c@X^AYpkev=@4@~zhYz?{>wPw}KS~$0%GaFZ
zzbhtx)a3eXZ5PM8f<k`q*_I91HtG8EdcAqQK?sHhAqa&Qvv3(^BMds|5snBLU_>P5
zAPUilQS*9Z`}T-%OPt<2njVMC5wDJ>C+Mewl@<}HH7yba8dIn`rZKH3>8??#8}07G
zrq-1W&IV7O+~8_z^^|8@YwWd^tqzZM=6Xh%yUZmA9Mj9icBkTQ|KEgwM*>5<hEfv}
zF&9ayp;Y=MCOJd?Pu;)f0VzUPCCycn8YOeE=ypm8qSh%z`A5Z~$0^0DOpU>DnVHp1
ztu6T}9W(PpNsSbp;Jn!OKZ}9k1r8}%ZBwK_`n4{l#$K+7=7}U(7`u}~gA_58BrjF>
z{w8(Ai>C9YkcgS#Tbt!Han2xXGymS!G>hEXDNhHr1Z=LqH?zg+u)FF!_1heBv>5M~
zj2AN_FWFg<y;F`AOHxjSO3PhE4Rw`O?H;?FFK1^h$dS_nFXHFLiP2)xAjhr=_@?P5
zDpER%D?RnrT8E;z&E`vc@+h842Rmc7$n#}?iI#t>S*Vj`U6^a>DiR0xn-aXKMj2P&
zN+cr%skjPhFvEg$%tHn;Va0r8AsY*DHFA)PYp@X4ViEGN7}p^m*JB9^a06~cA(rAM
zEJG1)#&X<(6<CR4+=^AOp#-<#cC1Dz?!cY63u~|zccTpV;9iuY0+pyjHELi-E$UE@
z2Hb~6IN*c}3YyRiH(KC9EAGbwXhS<5L<c(2g@@3M9`xd2^x+Xaihg*p4(qW2k6|Mo
z#}n9u&G6w#3}6ekVjBdW!XUQeY3#sGJcC`>jc4&3p2rJ#5ij9oyn;R0i+y+%uVFt9
zU<e2CI)*WVLwEx!-o#rtjJNR)MsWm3aSX@tE>7S*ypIoX5+7m=AK_z+;}j<F2`2F=
zKEvnu0;lmMzQP$b)i||oJwJWP_NipiJvbFAzW+&@<sBKE!q@l)-{Pz~GWgxOu|ENh
Ck1Lx1

delta 1058
zcmW;CX;92@0LJktYd2eq-Ib*B7jms5BzKnFiE^yumO?5;&ULhvwn9?N&r!-PNfG|e
zkRy@YN35nd4X=7(yvUeleCx$$o@eHH{?xW8ZB;GGvOHz3F-n~i^0zgFF;Q13e2cZt
z<w;JONKxpda25q&8bj+?ZjUu;+g`sdZvJg0J5^WGRvH`>jiTX~CRoHb>lG<xi`8s#
zfFs&Lf%Z^B1t)ZX8qRQm1|87}ouP#edUS!SY_@bwDYB{!Zs-PgS#9X<QYV`f9zmg2
zACm_>;e{Tuk4b8B6<!gNrwGXOP|4vjlDDJW6esyQii#LXCF-Lkot%{*{Y(=zfu4SH
zW3yy-x7zhR;f-GCjXv-}U-UzN48TAbFbIP&1ViDAVHl1P@WV*>V-!YX48~#{#$y5k
zFcC&f!ej(u3Z`Njreg+XVitlh8^M@^xd=fh=3zb-U?EIcgfJ{dIF?{3mSH(oU?o;z
zH6pMEk%+=ttiyUlV*_Fki#TjVJQA=8n~{hu*otk~jvd$uGj?G&_FylPU_mlckcxds
zgB9t>KqmI%01hGxhmeiK$U!b_ID(@PIELdmfs@EXK2D(kg*c5fIE!;Qj|;enODMu+
z6ypj?a22H}!!=w-Id0%4Zb8Ov+`(Pk!+ktJ1s>uN9-|UZ@D$JR994LMYP`fN)ZjI0
t@dj`44)5^+AMpvF@daOHyS^?xLzMpWQdw>Jb@+zwu;Yhp%dc;!{tr)->qY<o

diff --git a/src/model/build-parameters.ts b/src/model/build-parameters.ts
index bd5f9103..3ecb4dbc 100644
--- a/src/model/build-parameters.ts
+++ b/src/model/build-parameters.ts
@@ -116,10 +116,12 @@ class BuildParameters {
       if (!Input.unitySerial && GitHub.githubInputEnabled) {
         // No serial was present, so it is a personal license that we need to convert
         if (!Input.unityLicense) {
-          throw new Error(`Missing Unity License File and no Serial was found. If this
+          throw new Error(
+            `Missing Unity License File and no Serial was found. If this
                             is a personal license, make sure to follow the activation
                             steps and set the UNITY_LICENSE GitHub secret or enter a Unity
-                            serial number inside the UNITY_SERIAL GitHub secret.`);
+                            serial number inside the UNITY_SERIAL GitHub secret.`,
+          );
         }
         unitySerial = this.getSerialFromLicenseFile(Input.unityLicense);
       } else {
@@ -156,6 +158,8 @@ class BuildParameters {
       sshPublicKeysDirectoryPath: Input.sshPublicKeysDirectoryPath,
       gitPrivateToken: Input.gitPrivateToken || (await GithubCliReader.GetGitHubAuthToken()),
       chownFilesTo: Input.chownFilesTo,
+      dockerCpuLimit: Input.dockerCpuLimit,
+      dockerMemoryLimit: Input.dockerMemoryLimit,
       providerStrategy: CloudRunnerOptions.providerStrategy,
       buildPlatform: CloudRunnerOptions.buildPlatform,
       kubeConfig: CloudRunnerOptions.kubeConfig,
diff --git a/src/model/docker.ts b/src/model/docker.ts
index 24b93ab5..de0a9354 100644
--- a/src/model/docker.ts
+++ b/src/model/docker.ts
@@ -86,7 +86,15 @@ class Docker {
   }
 
   static getWindowsCommand(image: string, parameters: DockerParameters): string {
-    const { workspace, actionFolder, unitySerial, gitPrivateToken, dockerWorkspacePath } = parameters;
+    const {
+      workspace,
+      actionFolder,
+      unitySerial,
+      gitPrivateToken,
+      dockerWorkspacePath,
+      dockerCpuLimit,
+      dockerMemoryLimit,
+    } = parameters;
 
     return `docker run \
             --workdir c:${dockerWorkspacePath} \
@@ -97,12 +105,15 @@ class Docker {
             ${gitPrivateToken ? `--env GIT_PRIVATE_TOKEN="${gitPrivateToken}"` : ''} \
             --volume "${workspace}":"c:${dockerWorkspacePath}" \
             --volume "c:/regkeys":"c:/regkeys" \
+            --volume "C:/Program Files/Microsoft Visual Studio":"C:/Program Files/Microsoft Visual Studio" \
             --volume "C:/Program Files (x86)/Microsoft Visual Studio":"C:/Program Files (x86)/Microsoft Visual Studio" \
             --volume "C:/Program Files (x86)/Windows Kits":"C:/Program Files (x86)/Windows Kits" \
             --volume "C:/ProgramData/Microsoft/VisualStudio":"C:/ProgramData/Microsoft/VisualStudio" \
             --volume "${actionFolder}/default-build-script":"c:/UnityBuilderAction" \
             --volume "${actionFolder}/platforms/windows":"c:/steps" \
             --volume "${actionFolder}/BlankProject":"c:/BlankProject" \
+            --cpus=${dockerCpuLimit} \
+            --memory=${dockerMemoryLimit} \
             ${image} \
             powershell c:/steps/entrypoint.ps1`;
   }
diff --git a/src/model/input.ts b/src/model/input.ts
index f50b0633..fc9f447d 100644
--- a/src/model/input.ts
+++ b/src/model/input.ts
@@ -4,6 +4,7 @@ import { Cli } from './cli/cli';
 import CloudRunnerQueryOverride from './cloud-runner/options/cloud-runner-query-override';
 import Platform from './platform';
 import GitHub from './github';
+import os from 'node:os';
 
 import * as core from '@actions/core';
 
@@ -226,6 +227,16 @@ class Input {
     return Input.getInput('dockerWorkspacePath') || '/github/workspace';
   }
 
+  static get dockerCpuLimit(): string {
+    return Input.getInput('dockerCpuLimit') || os.cpus().length.toString();
+  }
+
+  static get dockerMemoryLimit(): string {
+    const bytesInGigabyte = 1024 * 1024 * 1024;
+
+    return Input.getInput('dockerMemoryLimit') || `${Math.floor((os.totalmem() / bytesInGigabyte) * 0.75)}G`;
+  }
+
   public static ToEnvVarFormat(input: string) {
     if (input.toUpperCase() === input) {
       return input;