License Activation fixes and Github Annotations (#590)

* Ensure serial is prioritized

* Add compile listener to create github annotations

* Update node modules

* Don't build ubuntu on PR as secrets are now needed. Update PR template to request an example successful run. Remove 32bit windows build. Build on push to any branch

* Update activation to use blank project

* Ensure exceptions get annotated as well

* More robust console printing

* Update test project

* Build iOS test on macos to verify burst functionality. Add annotation for license activation error. Fix unity version test. Remove minification from android

* Improve license checks

* Mask partially redacted serial in addition to full serial

* Add retry logic to ubuntu builds

* Allow dirty build on retry

* Bump unity version

dist/default-build-script/Assets/Editor/UnityBuilderAction/Reporting/CompileListener.cs

@@ -0,0 +1,36 @@
+using System;
+using UnityEngine;
+using UnityEditor;
+
+namespace UnityBuilderAction.Reporting
+{
+    [InitializeOnLoad]
+    static class CompileListener
+    {
+        static CompileListener()
+        {
+            if (Application.isBatchMode)
+            {
+                Application.logMessageReceived += Application_logMessageReceived;
+            }
+        }
+
+        private static void Application_logMessageReceived(string condition, string stackTrace, LogType type)
+        {
+            string prefix = "";
+            switch (type)
+            {
+                case LogType.Error:
+                    prefix = "error";
+                    break;
+                case LogType.Warning:
+                    prefix = "warning";
+                    break;
+                case LogType.Exception:
+                    prefix = "error";
+                    break;
+            }
+            Console.WriteLine($"{Environment.NewLine}::{prefix} ::{condition}{Environment.NewLine}{stackTrace}");
+        }
+    }
+}

dist/default-build-script/Assets/Editor/UnityBuilderAction/Reporting/CompileListener.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: fad44373fb7b61a4bb584e2675795aca
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

dist/licenses.txt

@@ -356,6 +356,28 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
+@fastify/busboy
+MIT
+Copyright Brian White. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
+
 @kubernetes/client-node
 Apache-2.0
                                  Apache License
@@ -1741,28 +1763,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
-busboy
-MIT
-Copyright Brian White. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
-
 byline
 MIT
 node-byline (C) 2011-2015 John Hewson
@@ -4410,28 +4410,6 @@ IN THE SOFTWARE.
 stream-buffers
 Unlicense
 
-streamsearch
-MIT
-Copyright Brian White. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
-
 strip-final-newline
 MIT
 MIT License

dist/platforms/mac/steps/activate.sh

@@ -20,6 +20,10 @@ 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
 #
@@ -30,6 +34,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
 

dist/platforms/ubuntu/steps/activate.sh

@@ -4,64 +4,13 @@
 echo "Changing to \"$ACTIVATE_LICENSE_PATH\" directory."
 pushd "$ACTIVATE_LICENSE_PATH"
 
-if [[ -n "$UNITY_LICENSE" ]] || [[ -n "$UNITY_LICENSE_FILE" ]]; then
+if [[ -n "$UNITY_SERIAL" && -n "$UNITY_EMAIL" && -n "$UNITY_PASSWORD" ]]; then
   #
-  # PERSONAL LICENSE MODE
-  #
-  # This will activate Unity, using a license file
-  #
-  # Note that this is the ONLY WAY for PERSONAL LICENSES in 2020.
-  #   * See for more details: https://gitlab.com/gableroux/unity3d-gitlab-ci-example/issues/5#note_72815478
-  #
-  # The license file can be acquired using `webbertakken/request-manual-activation-file` action.
-  echo "Requesting activation (personal license)"
-
-  # Set the license file path
-  FILE_PATH=UnityLicenseFile.ulf
-
-  if [[ -n "$UNITY_LICENSE" ]]; then
-    # Copy license file from Github variables
-    echo "$UNITY_LICENSE" | tr -d '\r' > $FILE_PATH
-  elif [[ -n "$UNITY_LICENSE_FILE" ]]; then
-    # Copy license file from file system
-    cat "$UNITY_LICENSE_FILE" | tr -d '\r' > $FILE_PATH
-  fi
-
-  # Activate license
-  ACTIVATION_OUTPUT=$(unity-editor \
-      -logFile /dev/stdout \
-      -quit \
-      -manualLicenseFile $FILE_PATH)
-
-  # Store the exit code from the verify command
-  UNITY_EXIT_CODE=$?
-
-  # The exit code for personal activation is always 1;
-  # Determine whether activation was successful.
-  #
-  # Successful output should include the following:
-  #
-  #   "LICENSE SYSTEM [2020120 18:51:20] Next license update check is after 2019-11-25T18:23:38"
-  #
-  ACTIVATION_SUCCESSFUL=$(echo $ACTIVATION_OUTPUT | grep 'Next license update check is after' | wc -l)
-
-  # Set exit code to 0 if activation was successful
-  if [[ $ACTIVATION_SUCCESSFUL -eq 1 ]]; then
-    UNITY_EXIT_CODE=0
-  fi;
-
-  # Remove license file
-  rm -f $FILE_PATH
-
-elif [[ -n "$UNITY_SERIAL" && -n "$UNITY_EMAIL" && -n "$UNITY_PASSWORD" ]]; then
-  #
-  # PROFESSIONAL (SERIAL) LICENSE MODE
+  # SERIAL LICENSE MODE
   #
   # This will activate unity, using the activating process.
   #
-  # Note: This is the preferred way for PROFESSIONAL LICENSES.
-  #
-  echo "Requesting activation (professional license)"
+  echo "Requesting activation"
 
   # Activate license
   unity-editor \
@@ -69,11 +18,16 @@ elif [[ -n "$UNITY_SERIAL" && -n "$UNITY_EMAIL" && -n "$UNITY_PASSWORD" ]]; then
     -quit \
     -serial "$UNITY_SERIAL" \
     -username "$UNITY_EMAIL" \
-    -password "$UNITY_PASSWORD"
+    -password "$UNITY_PASSWORD" \
+    -projectPath "/BlankProject"
 
   # Store the exit code from the verify command
   UNITY_EXIT_CODE=$?
 
+  if [ ! -f "~/.local/share/unity3d/Unity/Unity_lic.ulf" ]; then
+    echo "::error ::There was an error while trying to activate the Unity license."
+  fi
+
 elif [[ -n "$UNITY_LICENSING_SERVER" ]]; then
   #
   # Custom Unity License Server
@@ -100,6 +54,7 @@ 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.
   exit 1;
 

dist/platforms/ubuntu/steps/return_license.sh

@@ -13,14 +13,17 @@ if [[ -n "$UNITY_LICENSING_SERVER" ]]; then  #
   /opt/unity/Editor/Data/Resources/Licensing/Client/Unity.Licensing.Client --return-floating "$FLOATING_LICENSE"
 elif [[ -n "$UNITY_SERIAL" ]]; then
   #
-  # PROFESSIONAL (SERIAL) LICENSE MODE
+  # SERIAL LICENSE MODE
   #
   # This will return the license that is currently in use.
   #
   unity-editor \
     -logFile /dev/stdout \
     -quit \
-    -returnlicense
+    -returnlicense \
+    -username "$UNITY_EMAIL" \
+    -password "$UNITY_PASSWORD" \
+    -projectPath "/BlankProject"
 fi
 
 # Return to previous working directory

dist/platforms/windows/activate.ps1

@@ -12,3 +12,8 @@ Write-Output ""
                                      -serial $Env:UNITY_SERIAL `
                                      -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."
+}