From 8ca1282c9eabf4b053576f63611d21ee855b80db Mon Sep 17 00:00:00 2001 From: Andrew Kahr <22359829+AndrewKahr@users.noreply.github.com> Date: Fri, 24 Nov 2023 23:24:16 -0800 Subject: [PATCH 1/3] Allow Running Container as Runner Host User (#600) - Added `runAsHostUser` to allow running the container as the same user as the host system. This fixes most permissions issues on self-hosted runners. - Perform android sdk setup during entrypoint.sh to ensure it has root permissions if the user switches to a non-root user - Automatically detect android sdk target version if parameters are not already provided to configure the sdk - Generate a new uuid for machineID to ensure separate containers are unique to reduce license activation errors - Add exponential retry strategy for Ubuntu license activations --- action.yml | 6 + .../ProjectSettings/XRSettings.asset | 10 -- dist/index.js | Bin 22177358 -> 22177589 bytes dist/index.js.map | Bin 14648317 -> 14648588 bytes dist/platforms/mac/entrypoint.sh | 2 +- dist/platforms/mac/steps/activate.sh | 4 - dist/platforms/ubuntu/entrypoint.sh | 103 +++++++++++------- dist/platforms/ubuntu/steps/activate.sh | 63 +++++++---- dist/platforms/ubuntu/steps/build.sh | 21 ---- dist/platforms/ubuntu/steps/runsteps.sh | 40 +++++++ dist/platforms/windows/activate.ps1 | 5 +- dist/platforms/windows/entrypoint.ps1 | 7 +- src/model/build-parameters.ts | 2 + src/model/image-environment-factory.ts | 1 + src/model/input.ts | 4 + 15 files changed, 170 insertions(+), 98 deletions(-) delete mode 100644 dist/BlankProject/ProjectSettings/XRSettings.asset create mode 100644 dist/platforms/ubuntu/steps/runsteps.sh diff --git a/action.yml b/action.yml index 989c2569..121174df 100644 --- a/action.yml +++ b/action.yml @@ -101,6 +101,12 @@ inputs: required: false default: '' description: '[CloudRunner] GitHub owner name or organization/team name' + runAsHostUser: + required: false + default: 'false' + description: + 'Whether to run as a user that matches the host system or the default root container user. Only applicable to + Linux hosts and containers. This is useful for fixing permission errors on Self-Hosted runners.' chownFilesTo: required: false default: '' diff --git a/dist/BlankProject/ProjectSettings/XRSettings.asset b/dist/BlankProject/ProjectSettings/XRSettings.asset deleted file mode 100644 index 482590c1..00000000 --- a/dist/BlankProject/ProjectSettings/XRSettings.asset +++ /dev/null @@ -1,10 +0,0 @@ -{ - "m_SettingKeys": [ - "VR Device Disabled", - "VR Device User Alert" - ], - "m_SettingValues": [ - "False", - "False" - ] -} \ No newline at end of file diff --git a/dist/index.js b/dist/index.js index dc3aac42a703b775526b6293e055ff2f7be75896..f55c9a5754ad0fa61144fc31a46181f3f2597b72 100644 GIT binary patch delta 1594 zcmY+^XM7BH9LMojxEP6WMkdZ#iA-W0F@q2*A#qxSOH@)J4RVRq)F$@k?7bzLR5dYT zwP?^(wPss;&(>MwXo9A&pc$GY3@y+StDtoWS=e!bzOMY5ag<{D?F731{&$e!)4M z#|2!(C0xd@_zl0~3a;WBuHy!7;udb>4({R}?&AR-;t?L>37+B){E26Hju&`|SNIEm z;~%`nzxWUT;|<=(n@Kqv{BkB;YvHDz0yI6P&z7|lt`ts(naa2bW^%3 QQA)JZ!|4$JiPMvucWvM8%m4rY delta 1457 zcmWmEXI~8f0EO}2CCSYw4Jx5jq(bu=722i9-r3oE?=56y@4aV6lD)~u-h1!8x97b0 zKOf+{I2k$F#+)3p?1O2#Uf1j&MRTIHNd9pd?)2ic)ZcJ3LStW#Eaj@PapdP!8o$ z0lx5qKLQYlAec}Ql~5T~5R4FnqAIGPI>Hc+2t*Z1V~q7fQH+crfrG)EFzpe0(NHQJyp+94V3(E%ON37ydeUC|BQ(E~lv3%$_?ebEp7 zF#rQG2!k;MLop1)F#;no3ZpRwV=)dX7>@~4_=<1%jvx4mU-*qb_=|t3(OHJ6 zP;x1`6*DD|Vy@&>ER=kTQL$9=D+QE-N+HEcu~rHzHj1rcr`Rh+l%k4*;;1+&#S~|y zxKctXskkVvN-4!naaTN)(n=Y{Qz@%>Dc*{YQcfwaR8V{sKgC}OPy&@8#iUeJDk+tf yDoU^tqJ%0{m1;_LB}@rdB9uraN{LotlvpKBsiDLx2}(_+mXc^Vz@Hf2Zu$?%v7Rgd diff --git a/dist/index.js.map b/dist/index.js.map index 6f16cb34d7228988949499d3aa0c00a6b3e1ff10..c72ad08ff8d9e7cbba7b326cb543e4bc810fb100 100644 GIT binary patch delta 1209 zcmY+-Syaqn7{~E5V+#GJW~NjkW`t7qeWws*YgA*6l**PtQ-o||86`AYUVHZJhVW-> zSt1l7`+DJmJI-;z1;=+>IJ)?p^S;mdJ-_Fd?YDb=-fwq@siEEIR%}p7Vt0t@M`3}& zL;N_UzUg|%r9U;nit>+@pOk;UzS&-blqEIZpM|zsp(;<;eotXnXfJt7@(DM;^GZ>X z?Jo(hDxV?>gX~5VYmyiot-EYD8pVQKe@U)+<*Qb>#^vT^wJN(&Bf{gglF(Vy?M1;C zPo1ceydD3dVXml$DEp@A#icb4tIc6mK#2xW!42+ch(>4(4@gkM6JF3j3mv@SgC_8W zAN&+9jv8J(! z5pju8F>&#Urntyh5$@Fcdj8jznjv&feV|wh zea#F8TV;StD+Hl6+Mq3h5rTFIMHt$n13ID;I-?7^q8qxS2YR9xdZQ2eq96KW00v?Z z1|u917=ob~hDZ#@2t*+oBQXl2F$QB110%*E7IBD&3F9#V6EO*sF$D>jifKs1bR;1e zGmwH*q+upzVK(MqF48d%X3WO|EJOw@$V3(vVKK6?1WU0DIarPrScz3w4J+1QE!JT@ zY}kNYn+(sqt;4Z3g5BKo^)u_Qk iJi=qt;t8Ij4$tr$FYpqt@EULM7Vq$0t_=9lXU-pU;u;$O delta 1048 zcmW;HS4@)u6o%n+*xDAP6l%2&oZvtOH%@SG>p*d1#f1pC!Bs746|uI0{LZ=;iWIB< zDn+dmH(IwS7wV-6ns}j!#J5~L$(NHa=j7z&)++wlY8CE8WxhkA7RpunKZOZ8jo`}A z`2?*rTq6cs4Jx@%6D!e(7QOtJq|_8G33NS~+TSUGAi8{pAgR+-BqWE*H9}NHSb3A2gIIJ$H*`l2^h7W8MjZN}FZ!WB24EoKk$^!M zj3F3`VHl1P7>Q9BjWHODaTpI1CSW2aVKNdi1yhlPX_$@~n2A{k{5}WCmYNW)U3BLkUOhUHj+l~{$Aq4({R}?&AR-q5_Zb7*FsN&+r^CP>Gj# c1wUTn4c_7%-s1y4;uEUy8DB)du{tjGKmHu&WdHyG diff --git a/dist/platforms/mac/entrypoint.sh b/dist/platforms/mac/entrypoint.sh index 80ec6d09..bea8f36a 100755 --- a/dist/platforms/mac/entrypoint.sh +++ b/dist/platforms/mac/entrypoint.sh @@ -41,7 +41,7 @@ echo "" echo "Please note that the exit code is not very descriptive." echo "Most likely it will not help you solve the issue." echo "" -echo "To find the reason for failure: please search for errors in the log above." +echo "To find the reason for failure: please search for errors in the log above and check for annotations in the summary view." echo "" fi; diff --git a/dist/platforms/mac/steps/activate.sh b/dist/platforms/mac/steps/activate.sh index 2d3339ef..3f749f04 100755 --- a/dist/platforms/mac/steps/activate.sh +++ b/dist/platforms/mac/steps/activate.sh @@ -20,10 +20,6 @@ echo "Requesting activation" # Store the exit code from the verify command UNITY_EXIT_CODE=$? -if [ ! -f "/Library/Application Support/Unity/Unity_lic.ulf" ]; then - echo "::error ::There was an error while trying to activate the Unity license." -fi - # # Display information about the result # diff --git a/dist/platforms/ubuntu/entrypoint.sh b/dist/platforms/ubuntu/entrypoint.sh index af7a4ea2..0847d0c9 100755 --- a/dist/platforms/ubuntu/entrypoint.sh +++ b/dist/platforms/ubuntu/entrypoint.sh @@ -1,47 +1,76 @@ #!/usr/bin/env bash -# -# Create directory for license activation -# - -ACTIVATE_LICENSE_PATH="$GITHUB_WORKSPACE/_activate-license~" -mkdir -p "$ACTIVATE_LICENSE_PATH" +# Ensure machine ID is randomized +dbus-uuidgen > /etc/machine-id && mkdir -p /var/lib/dbus/ && ln -sf /etc/machine-id /var/lib/dbus/machine-id # -# Run steps -# -source /steps/set_extra_git_configs.sh -source /steps/set_gitcredential.sh -source /steps/activate.sh -source /steps/build.sh -source /steps/return_license.sh - -# -# Remove license activation directory +# Prepare Android SDK, if needed +# We do this here to ensure it has root permissions # -rm -r "$ACTIVATE_LICENSE_PATH" -chmod -R 777 "/BlankProject" +fullProjectPath="$GITHUB_WORKSPACE/$PROJECT_PATH" -# -# Instructions for debugging -# +if [[ "$BUILD_TARGET" == "Android" ]]; then + export JAVA_HOME="$(awk -F'=' '/JAVA_HOME=/{print $2}' /usr/bin/unity-editor.d/*)" + ANDROID_HOME_DIRECTORY="$(awk -F'=' '/ANDROID_HOME=/{print $2}' /usr/bin/unity-editor.d/*)" + SDKMANAGER=$(find $ANDROID_HOME_DIRECTORY/cmdline-tools -name sdkmanager) + if [ -z "${SDKMANAGER}" ] + then + echo "No sdkmanager found" + exit 1 + fi -if [[ $BUILD_EXIT_CODE -gt 0 ]]; then -echo "" -echo "###########################" -echo "# Failure #" -echo "###########################" -echo "" -echo "Please note that the exit code is not very descriptive." -echo "Most likely it will not help you solve the issue." -echo "" -echo "To find the reason for failure: please search for errors in the log above." -echo "" -fi; + if [[ -n "$ANDROID_SDK_MANAGER_PARAMETERS" ]]; then + echo "Updating Android SDK with parameters: $ANDROID_SDK_MANAGER_PARAMETERS" + $SDKMANAGER "$ANDROID_SDK_MANAGER_PARAMETERS" + else + echo "Updating Android SDK with auto detected target API version" + # Read the line containing AndroidTargetSdkVersion from the file + targetAPILine=$(grep 'AndroidTargetSdkVersion' "$fullProjectPath/ProjectSettings/ProjectSettings.asset") -# -# Exit with code from the build step. -# + # Extract the number after the semicolon + targetAPI=$(echo "$targetAPILine" | cut -d':' -f2 | tr -d '[:space:]') -exit $BUILD_EXIT_CODE + $SDKMANAGER "platforms;android-$targetAPI" + fi + + echo "Updated Android SDK." +else + echo "Not updating Android SDK." +fi + +if [[ "$RUN_AS_HOST_USER" == "true" ]]; then + echo "Running as host user" + + # Stop on error if we can't set up the user + set -e + + # Get host user/group info so we create files with the correct ownership + USERNAME=$(stat -c '%U' "$fullProjectPath") + USERID=$(stat -c '%u' "$fullProjectPath") + GROUPNAME=$(stat -c '%G' "$fullProjectPath") + GROUPID=$(stat -c '%g' "$fullProjectPath") + + groupadd -g $GROUPID $GROUPNAME + useradd -u $USERID -g $GROUPID $USERNAME + usermod -aG $GROUPNAME $USERNAME + mkdir -p "/home/$USERNAME" + chown $USERNAME:$GROUPNAME "/home/$USERNAME" + + # Normally need root permissions to access when using su + chmod 777 /dev/stdout + chmod 777 /dev/stderr + + # Don't stop on error when running our scripts as error handling is baked in + set +e + + # Switch to the host user so we can create files with the correct ownership + su $USERNAME -c "$SHELL -c 'source /steps/runsteps.sh'" +else + echo "Running as root" + + # Run as root + source /steps/runsteps.sh +fi + +exit $? diff --git a/dist/platforms/ubuntu/steps/activate.sh b/dist/platforms/ubuntu/steps/activate.sh index 4af50212..61c649d7 100755 --- a/dist/platforms/ubuntu/steps/activate.sh +++ b/dist/platforms/ubuntu/steps/activate.sh @@ -1,31 +1,54 @@ #!/usr/bin/env bash -# Run in ACTIVATE_LICENSE_PATH directory -echo "Changing to \"$ACTIVATE_LICENSE_PATH\" directory." -pushd "$ACTIVATE_LICENSE_PATH" - if [[ -n "$UNITY_SERIAL" && -n "$UNITY_EMAIL" && -n "$UNITY_PASSWORD" ]]; then # # SERIAL LICENSE MODE # - # This will activate unity, using the activating process. + # This will activate unity, using the serial activation process. # echo "Requesting activation" - # Activate license - unity-editor \ - -logFile /dev/stdout \ - -quit \ - -serial "$UNITY_SERIAL" \ - -username "$UNITY_EMAIL" \ - -password "$UNITY_PASSWORD" \ - -projectPath "/BlankProject" + # Loop the unity-editor call until the license is activated with exponential backoff and a maximum of 5 retries + retry_count=0 - # Store the exit code from the verify command - UNITY_EXIT_CODE=$? + # Initialize delay to 15 seconds + delay=15 - if [ ! -f "~/.local/share/unity3d/Unity/Unity_lic.ulf" ]; then - echo "::error ::There was an error while trying to activate the Unity license." + # Loop until UNITY_EXIT_CODE is 0 or retry count reaches 5 + while [[ $retry_count -lt 5 ]] + do + # Activate license + unity-editor \ + -logFile /dev/stdout \ + -quit \ + -serial "$UNITY_SERIAL" \ + -username "$UNITY_EMAIL" \ + -password "$UNITY_PASSWORD" \ + -projectPath "/BlankProject" + + # Store the exit code from the verify command + UNITY_EXIT_CODE=$? + + # Check if UNITY_EXIT_CODE is 0 + if [[ $UNITY_EXIT_CODE -eq 0 ]] + then + echo "Activation successful" + break + else + echo "Activation failed, retrying in $delay seconds..." + sleep $delay + + # Increment retry count + ((retry_count++)) + + # Double the delay for the next iteration + delay=$((delay * 2)) + fi + done + + if [[ $retry_count -eq 5 ]] + then + echo "Activation failed after 5 retries" fi elif [[ -n "$UNITY_LICENSING_SERVER" ]]; then @@ -54,8 +77,9 @@ else echo "Visit https://game.ci/docs/github/getting-started for more" echo "details on how to set up one of the possible activation strategies." - echo "::error ::No valid license activation strategy could be determined." - # Immediately exit as no UNITY_EXIT_CODE can be derrived. + echo "::error ::No valid license activation strategy could be determined. Make sure to provide UNITY_EMAIL, UNITY_PASSWORD, and either a UNITY_SERIAL \ +or UNITY_LICENSE. Otherwise please use UNITY_LICENSING_SERVER." + # Immediately exit as no UNITY_EXIT_CODE can be derived. exit 1; fi @@ -70,6 +94,7 @@ else # Activation failed so exit with the code from the license verification step echo "Unclassified error occured while trying to activate license." echo "Exit code was: $UNITY_EXIT_CODE" + echo "::error ::There was an error while trying to activate the Unity license." exit $UNITY_EXIT_CODE fi diff --git a/dist/platforms/ubuntu/steps/build.sh b/dist/platforms/ubuntu/steps/build.sh index 7a202bab..4cdb3e89 100755 --- a/dist/platforms/ubuntu/steps/build.sh +++ b/dist/platforms/ubuntu/steps/build.sh @@ -62,27 +62,6 @@ else # fi -# -# Prepare Android SDK, if needed -# - -if [[ "$BUILD_TARGET" == "Android" && -n "$ANDROID_SDK_MANAGER_PARAMETERS" ]]; then - echo "Updating Android SDK with parameters: $ANDROID_SDK_MANAGER_PARAMETERS" - export JAVA_HOME="$(awk -F'=' '/JAVA_HOME=/{print $2}' /usr/bin/unity-editor.d/*)" - ANDROID_HOME_DIRECTORY="$(awk -F'=' '/ANDROID_HOME=/{print $2}' /usr/bin/unity-editor.d/*)" - SDKMANAGER=$(find $ANDROID_HOME_DIRECTORY/cmdline-tools -name sdkmanager) - if [ -z "${SDKMANAGER}" ] - then - echo "No sdkmanager found" - exit 1 - fi - - $SDKMANAGER "$ANDROID_SDK_MANAGER_PARAMETERS" - echo "Updated Android SDK." -else - echo "Not updating Android SDK." -fi - # # Pre-build debug information # diff --git a/dist/platforms/ubuntu/steps/runsteps.sh b/dist/platforms/ubuntu/steps/runsteps.sh new file mode 100644 index 00000000..e8376051 --- /dev/null +++ b/dist/platforms/ubuntu/steps/runsteps.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env bash + +# +# Run steps +# +source /steps/set_extra_git_configs.sh +source /steps/set_gitcredential.sh +source /steps/activate.sh + +# If we didn't activate successfully, exit with the exit code from the activation step. +if [[ $UNITY_EXIT_CODE -ne 0 ]]; then + exit $UNITY_EXIT_CODE +fi + +source /steps/build.sh +source /steps/return_license.sh + +# +# Instructions for debugging +# + +if [[ $BUILD_EXIT_CODE -gt 0 ]]; then +echo "" +echo "###########################" +echo "# Failure #" +echo "###########################" +echo "" +echo "Please note that the exit code is not very descriptive." +echo "Most likely it will not help you solve the issue." +echo "" +echo "To find the reason for failure: please search for errors in the log above and check for annotations in the summary view." +echo "" +fi; + +# +# Exit with code from the build step. +# + +# Exiting su +exit $BUILD_EXIT_CODE diff --git a/dist/platforms/windows/activate.ps1 b/dist/platforms/windows/activate.ps1 index 5e505b46..897ec17e 100644 --- a/dist/platforms/windows/activate.ps1 +++ b/dist/platforms/windows/activate.ps1 @@ -13,7 +13,4 @@ Write-Output "" -projectPath "c:/BlankProject" ` -logfile - | Out-Host -if(-not(Test-path "C:/ProgramData/Unity/Unity_lic.ulf" -PathType leaf)) -{ - Write-Output "::error ::There was an error while trying to activate the Unity license." -} +$ACTIVATION_EXIT_CODE = $LASTEXITCODE diff --git a/dist/platforms/windows/entrypoint.ps1 b/dist/platforms/windows/entrypoint.ps1 index 07cbb070..fac75b74 100644 --- a/dist/platforms/windows/entrypoint.ps1 +++ b/dist/platforms/windows/entrypoint.ps1 @@ -1,5 +1,4 @@ Get-Process -Start-Sleep -Seconds 3 # Import any necessary registry keys, ie: location of windows 10 sdk # No guarantee that there will be any necessary registry keys, ie: tvOS @@ -17,13 +16,17 @@ Get-Process -Name regsvr32 | ForEach-Object { Stop-Process -Id $_.Id -Force } # Activate Unity . "c:\steps\activate.ps1" +# If we didn't activate successfully, exit with the exit code from the activation step. +if ($ACTIVATION_EXIT_CODE -ne 0) { + exit $ACTIVATION_EXIT_CODE +} + # Build the project . "c:\steps\build.ps1" # Free the seat for the activated license . "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 a91e165e..6710a4da 100644 --- a/src/model/build-parameters.ts +++ b/src/model/build-parameters.ts @@ -59,6 +59,7 @@ class BuildParameters { public kubeVolumeSize!: string; public kubeVolume!: string; public kubeStorageClass!: string; + public runAsHostUser!: String; public chownFilesTo!: string; public commandHooks!: string; public pullInputList!: string[]; @@ -168,6 +169,7 @@ class BuildParameters { sshAgent: Input.sshAgent, sshPublicKeysDirectoryPath: Input.sshPublicKeysDirectoryPath, gitPrivateToken: Input.gitPrivateToken || (await GithubCliReader.GetGitHubAuthToken()), + runAsHostUser: Input.runAsHostUser, chownFilesTo: Input.chownFilesTo, dockerCpuLimit: Input.dockerCpuLimit, dockerMemoryLimit: Input.dockerMemoryLimit, diff --git a/src/model/image-environment-factory.ts b/src/model/image-environment-factory.ts index 6162b50b..2df52f1a 100644 --- a/src/model/image-environment-factory.ts +++ b/src/model/image-environment-factory.ts @@ -62,6 +62,7 @@ class ImageEnvironmentFactory { { name: 'ANDROID_EXPORT_TYPE', value: parameters.androidExportType }, { name: 'ANDROID_SYMBOL_TYPE', value: parameters.androidSymbolType }, { name: 'CUSTOM_PARAMETERS', value: parameters.customParameters }, + { name: 'RUN_AS_HOST_USER', value: parameters.runAsHostUser }, { name: 'CHOWN_FILES_TO', value: parameters.chownFilesTo }, { name: 'GITHUB_REF', value: process.env.GITHUB_REF }, { name: 'GITHUB_SHA', value: process.env.GITHUB_SHA }, diff --git a/src/model/input.ts b/src/model/input.ts index 85f45733..c12abe00 100644 --- a/src/model/input.ts +++ b/src/model/input.ts @@ -193,6 +193,10 @@ class Input { return Input.getInput('gitPrivateToken'); } + static get runAsHostUser(): string { + return Input.getInput('runAsHostUser') || 'false'; + } + static get chownFilesTo() { return Input.getInput('chownFilesTo') || ''; } From 96cfb845ae98d6fa5a427c9717de446694804d8e Mon Sep 17 00:00:00 2001 From: Webber Takken Date: Sat, 25 Nov 2023 19:33:36 +0100 Subject: [PATCH 2/3] Update CONTRIBUTING.md (#601) --- CONTRIBUTING.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 669adb1b..a9228bae 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -25,7 +25,7 @@ Steps to be performed to submit a pull request: #### Pull Request Prerequisites -You have [Node](https://nodejs.org/) installed at v12.2.0+ and [Yarn](https://yarnpkg.com/) at v1.18.0+. +You have [Node](https://nodejs.org/) installed at v18+ and [Yarn](https://yarnpkg.com/) at v1.22.0+. Please note that commit hooks will run automatically to perform some tasks; @@ -36,7 +36,8 @@ Please note that commit hooks will run automatically to perform some tasks; #### Windows users Make sure your editor and terminal that run the tests are set to `Powershell 7` or above with -`Git's Unix tools for Windows` installed. Some tests require you to be able to run `sh` and other unix commands. +`Git's Unix tools for Windows` installed. This is because some tests require you to be able to run `sh` and other +unix commands. #### License From bbd713b05afb7069db7168195cb74a904966487f Mon Sep 17 00:00:00 2001 From: Andrew Kahr <22359829+AndrewKahr@users.noreply.github.com> Date: Mon, 27 Nov 2023 23:24:58 -0800 Subject: [PATCH 3/3] Fix pro activation (#602) - Only randomize uuid for personal licenses - Add warning annotation for license activation retries - add `engineExitCode` output - repo/code cleanup --- action.yml | 5 + .../Assembly-CSharp-Editor.csproj | 709 ------------------ .../ProjectSettings/XRSettings.asset | 10 - .../default-build-script.sln | 20 - .../default-build-script.sln.DotSettings | 3 - dist/index.js | Bin 22177589 -> 22176656 bytes dist/index.js.map | Bin 14648588 -> 14647500 bytes dist/platforms/ubuntu/entrypoint.sh | 7 +- dist/platforms/ubuntu/steps/activate.sh | 7 +- src/index.ts | 24 +- .../cloud-runner/providers/docker/index.ts | 9 +- src/model/docker.ts | 20 +- src/model/exec-with-error-check.ts | 29 - src/model/mac-builder.ts | 7 +- src/model/output.ts | 4 + test-project/ProjectSettings/XRSettings.asset | 10 - 16 files changed, 52 insertions(+), 812 deletions(-) delete mode 100644 dist/default-build-script/Assembly-CSharp-Editor.csproj delete mode 100644 dist/default-build-script/ProjectSettings/XRSettings.asset delete mode 100644 dist/default-build-script/default-build-script.sln delete mode 100644 dist/default-build-script/default-build-script.sln.DotSettings delete mode 100644 src/model/exec-with-error-check.ts delete mode 100644 test-project/ProjectSettings/XRSettings.asset diff --git a/action.yml b/action.yml index 121174df..02b4d3f1 100644 --- a/action.yml +++ b/action.yml @@ -261,6 +261,11 @@ outputs: description: 'The generated version used for the Unity build' androidVersionCode: description: 'The generated versionCode used for the Android Unity build' + engineExitCode: + description: + 'Returns the exit code from the build scripts. This code is 0 if the build was successful. If there was an error + during activation, the code is from the activation step. If activation is successful, the code is from the project + build step.' branding: icon: 'box' color: 'gray-dark' diff --git a/dist/default-build-script/Assembly-CSharp-Editor.csproj b/dist/default-build-script/Assembly-CSharp-Editor.csproj deleted file mode 100644 index 9b76da4d..00000000 --- a/dist/default-build-script/Assembly-CSharp-Editor.csproj +++ /dev/null @@ -1,709 +0,0 @@ - - - - latest - <_TargetFrameworkDirectories>non_empty_path_generated_by_unity.rider.package - <_FullFrameworkReferenceAssemblyPaths>non_empty_path_generated_by_unity.rider.package - true - - - Debug - AnyCPU - 10.0.20506 - 2.0 - - {B7F8614B-1EC2-9D3A-DA1C-4D279A867D74} - Library - Properties - Assembly-CSharp-Editor - v4.7.1 - 512 - . - - - true - full - false - Temp\bin\Debug\ - DEBUG;TRACE;UNITY_2019_2_11;UNITY_2019_2;UNITY_2019;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_EVENT_QUEUE;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_STANDARD_2_0;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;NET_4_6;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER - prompt - 4 - 0169 - False - - - pdbonly - true - Temp\bin\Release\ - prompt - 4 - 0169 - False - - - true - true - false - false - false - - - - C:\Program Files\Unity\2019.2.11f1\Editor\Data\Managed/UnityEngine/UnityEngine.dll - - - C:\Program Files\Unity\2019.2.11f1\Editor\Data\Managed/UnityEditor.dll - - - - - - - - - - - - - C:/Repositories/unity-builder/builder/default-build-script/Library/ScriptAssemblies/UnityEditor.TestRunner.dll - - - C:/Repositories/unity-builder/builder/default-build-script/Library/ScriptAssemblies/UnityEngine.TestRunner.dll - - - C:/Repositories/unity-builder/builder/default-build-script/Library/ScriptAssemblies/Unity.Timeline.Editor.dll - - - C:/Repositories/unity-builder/builder/default-build-script/Library/ScriptAssemblies/com.unity.multiplayer-hlapi.Editor.dll - - - C:/Repositories/unity-builder/builder/default-build-script/Library/ScriptAssemblies/Unity.VSCode.Editor.dll - - - C:/Repositories/unity-builder/builder/default-build-script/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll - - - C:/Repositories/unity-builder/builder/default-build-script/Library/ScriptAssemblies/UnityEngine.UI.dll - - - C:/Repositories/unity-builder/builder/default-build-script/Library/ScriptAssemblies/Unity.Timeline.dll - - - C:/Repositories/unity-builder/builder/default-build-script/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll - - - C:/Repositories/unity-builder/builder/default-build-script/Library/ScriptAssemblies/com.unity.multiplayer-weaver.Editor.dll - - - C:/Repositories/unity-builder/builder/default-build-script/Library/ScriptAssemblies/UnityEngine.XR.LegacyInputHelpers.dll - - - C:/Repositories/unity-builder/builder/default-build-script/Library/ScriptAssemblies/Unity.Rider.Editor.dll - - - C:/Repositories/unity-builder/builder/default-build-script/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll - - - C:/Repositories/unity-builder/builder/default-build-script/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll - - - C:/Repositories/unity-builder/builder/default-build-script/Library/ScriptAssemblies/UnityEditor.SpatialTracking.dll - - - C:/Repositories/unity-builder/builder/default-build-script/Library/ScriptAssemblies/UnityEngine.SpatialTracking.dll - - - C:/Repositories/unity-builder/builder/default-build-script/Library/ScriptAssemblies/Unity.TextMeshPro.dll - - - C:/Repositories/unity-builder/builder/default-build-script/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll - - - C:/Repositories/unity-builder/builder/default-build-script/Library/ScriptAssemblies/UnityEditor.XR.LegacyInputHelpers.dll - - - C:/Repositories/unity-builder/builder/default-build-script/Library/ScriptAssemblies/UnityEditor.UI.dll - - - C:/Repositories/unity-builder/builder/default-build-script/Library/ScriptAssemblies/com.unity.multiplayer-hlapi.Runtime.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.ARModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.AccessibilityModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.AndroidJNIModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.AnimationModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.AssetBundleModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.AudioModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.ClothModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterInputModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterRendererModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.CoreModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.CrashReportingModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.DSPGraphModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.DirectorModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.FileSystemHttpModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.GameCenterModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.GridModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.HotReloadModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.IMGUIModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.ImageConversionModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.InputModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.InputLegacyModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.JSONSerializeModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.LocalizationModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.ParticleSystemModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.PerformanceReportingModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.PhysicsModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.Physics2DModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.ProfilerModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.ScreenCaptureModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.SharedInternalsModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteMaskModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteShapeModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.StreamingModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.SubstanceModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.TLSModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainPhysicsModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.TextCoreModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.TextRenderingModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.TilemapModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.UIModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.UIElementsModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.UNETModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.UmbraModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityAnalyticsModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityConnectModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityTestProtocolModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAssetBundleModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAudioModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestTextureModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestWWWModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.VFXModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.VRModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.VehiclesModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.VideoModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.WindModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEngine/UnityEngine.XRModule.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/UnityExtensions/Unity/UnityVR/Editor/UnityEditor.VR.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/Managed/UnityEditor.Graphs.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/PlaybackEngines/AndroidPlayer/UnityEditor.Android.Extensions.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/PlaybackEngines/MetroSupport/UnityEditor.UWP.Extensions.dll - - - C:/Repositories/unity-builder/builder/default-build-script/Library/PackageCache/com.unity.ads@2.0.8/Editor/UnityEditor.Advertisements.dll - - - C:/Repositories/unity-builder/builder/default-build-script/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.Editor.dll - - - C:/Repositories/unity-builder/builder/default-build-script/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.StandardEvents.dll - - - C:/Repositories/unity-builder/builder/default-build-script/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.Tracker.dll - - - C:/Repositories/unity-builder/builder/default-build-script/Library/PackageCache/com.unity.purchasing@2.0.6/Editor/UnityEditor.Purchasing.dll - - - C:/Repositories/unity-builder/builder/default-build-script/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Core.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Runtime.Serialization.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Xml.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Xml.Linq.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Numerics.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Numerics.Vectors.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Net.Http.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Microsoft.CSharp.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Data.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/Microsoft.Win32.Primitives.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/netstandard.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.AppContext.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Collections.Concurrent.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Collections.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Collections.NonGeneric.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Collections.Specialized.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.Annotations.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.EventBasedAsync.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.Primitives.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.TypeConverter.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Console.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Data.Common.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.Contracts.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.Debug.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.FileVersionInfo.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.Process.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.StackTrace.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.TextWriterTraceListener.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.Tools.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.TraceSource.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Drawing.Primitives.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Dynamic.Runtime.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Globalization.Calendars.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Globalization.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Globalization.Extensions.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.Compression.ZipFile.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.FileSystem.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.FileSystem.DriveInfo.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.FileSystem.Primitives.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.FileSystem.Watcher.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.IsolatedStorage.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.MemoryMappedFiles.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.Pipes.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.UnmanagedMemoryStream.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Linq.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Linq.Expressions.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Linq.Parallel.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Linq.Queryable.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Http.Rtc.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.NameResolution.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.NetworkInformation.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Ping.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Primitives.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Requests.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Security.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Sockets.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.WebHeaderCollection.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.WebSockets.Client.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.WebSockets.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ObjectModel.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Emit.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Emit.ILGeneration.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Emit.Lightweight.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Extensions.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Primitives.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Resources.Reader.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Resources.ResourceManager.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Resources.Writer.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.CompilerServices.VisualC.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Extensions.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Handles.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.InteropServices.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.InteropServices.RuntimeInformation.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.InteropServices.WindowsRuntime.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Numerics.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Serialization.Formatters.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Serialization.Json.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Serialization.Primitives.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Serialization.Xml.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Claims.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.Algorithms.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.Csp.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.Encoding.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.Primitives.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.X509Certificates.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Principal.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.SecureString.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.Duplex.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.Http.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.NetTcp.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.Primitives.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.Security.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Text.Encoding.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Text.Encoding.Extensions.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Text.RegularExpressions.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Overlapped.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Tasks.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Tasks.Parallel.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Thread.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.ThreadPool.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Timer.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ValueTuple.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.ReaderWriter.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XDocument.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XmlDocument.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XmlSerializer.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XPath.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XPath.XDocument.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/UnityScript.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/UnityScript.Lang.dll - - - C:/Program Files/Unity/2019.2.11f1/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/Boo.Lang.dll - - - - - - - - diff --git a/dist/default-build-script/ProjectSettings/XRSettings.asset b/dist/default-build-script/ProjectSettings/XRSettings.asset deleted file mode 100644 index 482590c1..00000000 --- a/dist/default-build-script/ProjectSettings/XRSettings.asset +++ /dev/null @@ -1,10 +0,0 @@ -{ - "m_SettingKeys": [ - "VR Device Disabled", - "VR Device User Alert" - ], - "m_SettingValues": [ - "False", - "False" - ] -} \ No newline at end of file diff --git a/dist/default-build-script/default-build-script.sln b/dist/default-build-script/default-build-script.sln deleted file mode 100644 index eaea3785..00000000 --- a/dist/default-build-script/default-build-script.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{B7F8614B-1EC2-9D3A-DA1C-4D279A867D74}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B7F8614B-1EC2-9D3A-DA1C-4D279A867D74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B7F8614B-1EC2-9D3A-DA1C-4D279A867D74}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B7F8614B-1EC2-9D3A-DA1C-4D279A867D74}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B7F8614B-1EC2-9D3A-DA1C-4D279A867D74}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/dist/default-build-script/default-build-script.sln.DotSettings b/dist/default-build-script/default-build-script.sln.DotSettings deleted file mode 100644 index c1bfe2a5..00000000 --- a/dist/default-build-script/default-build-script.sln.DotSettings +++ /dev/null @@ -1,3 +0,0 @@ - - True - True \ No newline at end of file diff --git a/dist/index.js b/dist/index.js index f55c9a5754ad0fa61144fc31a46181f3f2597b72..b63cde657d8e434346273c5915f2f02ecb5a0541 100644 GIT binary patch delta 2158 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 diff --git a/dist/platforms/ubuntu/entrypoint.sh b/dist/platforms/ubuntu/entrypoint.sh index 0847d0c9..8b4fd2a7 100755 --- a/dist/platforms/ubuntu/entrypoint.sh +++ b/dist/platforms/ubuntu/entrypoint.sh @@ -1,7 +1,10 @@ #!/usr/bin/env bash -# Ensure machine ID is randomized -dbus-uuidgen > /etc/machine-id && mkdir -p /var/lib/dbus/ && ln -sf /etc/machine-id /var/lib/dbus/machine-id +# Ensure machine ID is randomized for personal license activation +if [[ "$UNITY_SERIAL" = F* ]]; then + echo "Randomizing machine ID for personal license activation" + dbus-uuidgen > /etc/machine-id && mkdir -p /var/lib/dbus/ && ln -sf /etc/machine-id /var/lib/dbus/machine-id +fi # # Prepare Android SDK, if needed diff --git a/dist/platforms/ubuntu/steps/activate.sh b/dist/platforms/ubuntu/steps/activate.sh index 61c649d7..efe95b83 100755 --- a/dist/platforms/ubuntu/steps/activate.sh +++ b/dist/platforms/ubuntu/steps/activate.sh @@ -35,12 +35,13 @@ if [[ -n "$UNITY_SERIAL" && -n "$UNITY_EMAIL" && -n "$UNITY_PASSWORD" ]]; then echo "Activation successful" break else - echo "Activation failed, retrying in $delay seconds..." - sleep $delay - # Increment retry count ((retry_count++)) + echo "::warning ::Activation failed, attempting retry #$retry_count" + echo "Activation failed, retrying in $delay seconds..." + sleep $delay + # Double the delay for the next iteration delay=$((delay * 2)) fi diff --git a/src/index.ts b/src/index.ts index 2457eb1d..89db2de3 100644 --- a/src/index.ts +++ b/src/index.ts @@ -19,18 +19,19 @@ async function runMain() { const buildParameters = await BuildParameters.create(); const baseImage = new ImageTag(buildParameters); + let exitCode = -1; + if (buildParameters.providerStrategy === 'local') { core.info('Building locally'); await PlatformSetup.setup(buildParameters, actionFolder); - if (process.platform === 'darwin') { - MacBuilder.run(actionFolder); - } else { - await Docker.run(baseImage.toString(), { - workspace, - actionFolder, - ...buildParameters, - }); - } + exitCode = + process.platform === 'darwin' + ? await MacBuilder.run(actionFolder) + : await Docker.run(baseImage.toString(), { + workspace, + actionFolder, + ...buildParameters, + }); } else { await CloudRunner.run(buildParameters, baseImage.toString()); } @@ -38,6 +39,11 @@ async function runMain() { // Set output await Output.setBuildVersion(buildParameters.buildVersion); await Output.setAndroidVersionCode(buildParameters.androidVersionCode); + await Output.setEngineExitCode(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 50cbf69f..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,11 +11,9 @@ 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 { let runCommand = ''; switch (process.platform) { case 'linux': @@ -25,12 +22,11 @@ class Docker { case 'win32': runCommand = this.getWindowsCommand(image, parameters); } - if (options) { - options.silent = silent; - await execWithErrorCheck(runCommand, undefined, options, errorWhenMissingUnityBuildResults); - } else { - 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 { - 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 eb9ec683..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) { - await execWithErrorCheck('bash', [`${actionFolder}/platforms/mac/entrypoint.sh`], { + public static async run(actionFolder: string, silent: boolean = false): Promise { + return await exec('bash', [`${actionFolder}/platforms/mac/entrypoint.sh`], { silent, + ignoreReturnCode: true, }); } } diff --git a/src/model/output.ts b/src/model/output.ts index 1d71bf86..440bb68e 100644 --- a/src/model/output.ts +++ b/src/model/output.ts @@ -8,6 +8,10 @@ class Output { static async setAndroidVersionCode(androidVersionCode: string) { core.setOutput('androidVersionCode', androidVersionCode); } + + static async setEngineExitCode(exitCode: number) { + core.setOutput('engineExitCode', exitCode); + } } export default Output; diff --git a/test-project/ProjectSettings/XRSettings.asset b/test-project/ProjectSettings/XRSettings.asset deleted file mode 100644 index 482590c1..00000000 --- a/test-project/ProjectSettings/XRSettings.asset +++ /dev/null @@ -1,10 +0,0 @@ -{ - "m_SettingKeys": [ - "VR Device Disabled", - "VR Device User Alert" - ], - "m_SettingValues": [ - "False", - "False" - ] -} \ No newline at end of file