Merge branch 'master' into 2020.3-urp

Author: JohannesDeml

.github/workflows/release.yml

@@ -92,7 +92,7 @@ jobs:
           restore-keys: Library-201x-
 
       - name: Build project
-        uses: game-ci/unity-builder@v2
+        uses: game-ci/unity-builder@v3
         env:
           UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
         with:

.github/workflows/upgrade-unity.yml

@@ -44,16 +44,23 @@ jobs:
     steps:
       - name: Log input parameter
         run: |
+          BRANCH_NAME=${GITHUB_REF#refs/heads/}
+
+          echo "Branch: $BRANCH_NAME"
           echo "Unity version: $UNITY_VERSION"
           echo "Create tags: $CREATE_TAGS"
-          echo "URP branch: $URP_BRANCH"
           echo "Only create tags: $TAGS_ONLY"
           echo "Merge master into branch: $MERGE_MASTER"
           echo "Custom cli arguments: $CUSTOM_PARAMETERS"
+          if [[ "$BRANCH_NAME" == *"urp"* ]]
+          then
+            echo "urp: true"
+          else
+            echo "urp: false"
+          fi
         env:
           UNITY_VERSION: ${{ inputs.unityVersion }}
           CREATE_TAGS: ${{ inputs.createTags }}
-          URP_BRANCH: ${{ inputs.urp }}
           TAGS_ONLY: ${{ inputs.tagsOnly }}
           MERGE_MASTER: ${{ inputs.mergeMaster }}
           CUSTOM_PARAMETERS: ${{ inputs.customParameters }}
@@ -77,7 +84,7 @@ jobs:
       - name: Merge master into current branch
         if: ${{ inputs.mergeMaster }}
         run: |
-          git fetch origin master --depth=1
+          git fetch origin master
           git merge FETCH_HEAD
           git push
 
@@ -107,15 +114,15 @@ jobs:
       - name: Set upgrade name
         id: upgrade_name
         run: |
-          if [[ "$URP_BRANCH" == "true" ]]
+          BRANCH_NAME=${GITHUB_REF#refs/heads/}
+          if [[ "$BRANCH_NAME" == *"urp"* ]]
           then
             echo "NAME=$UNITY_VERSION-urp" >> $GITHUB_OUTPUT
           else
             echo "NAME=$UNITY_VERSION" >> $GITHUB_OUTPUT
           fi
         env:
           UNITY_VERSION: ${{ inputs.unityVersion }}
-          URP_BRANCH: ${{ inputs.urp }}
 
       - name: Log variables
         run: |
@@ -124,7 +131,8 @@ jobs:
 
       - name: Build project
         if: ${{ !inputs.tagsOnly }}
-        uses: JohannesDeml/unity-builder@no-quit-parameter
+        # TODO change this back to v3 once manual exit is supported there
+        uses: game-ci/unity-builder@main
         env:
           UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
         with:
@@ -134,6 +142,7 @@ jobs:
           targetPlatform: WebGL
           buildName: ${{ needs.variables.outputs.BUILD_NAME }}
           allowDirtyBuild: true
+          manualExit: true
 
       - name: Delete build folder with elevated rights
         if: ${{ !inputs.tagsOnly }}
@@ -162,22 +171,34 @@ jobs:
       - name: Add tags
         if: ${{ inputs.createTags || inputs.tagsOnly }}
         run: |
-          if [[ "$URP_BRANCH" == "true" ]]
+          # Extract the first four characters of UNITY_VERSION
+          UNITY_YEAR=${UNITY_VERSION:0:4}
+          BRANCH_NAME=${GITHUB_REF#refs/heads/}
+
+          if [[ "$BRANCH_NAME" == *"urp"* ]]
           then
-            git tag -a -f $UNITY_VERSION-urp-webgl1 -m "[Automated workflow] Created by upgrade-unity"
+            if [[ "$UNITY_YEAR" < "2023" ]]
+            then
+              git tag -a -f $UNITY_VERSION-urp-webgl1 -m "[Automated workflow] Created by upgrade-unity"
+            fi
             git tag -a -f $UNITY_VERSION-urp-webgl2 -m "[Automated workflow] Created by upgrade-unity"
             git tag -a -f $UNITY_VERSION-urp-webgl2-debug -m "[Automated workflow] Created by upgrade-unity"
           else
-            git tag -a -f $UNITY_VERSION-minsize-webgl1 -m "[Automated workflow] Created by upgrade-unity"
-            git tag -a -f $UNITY_VERSION-webgl1 -m "[Automated workflow] Created by upgrade-unity"
-            git tag -a -f $UNITY_VERSION-webgl2 -m "[Automated workflow] Created by upgrade-unity"
+            if [[ "$UNITY_YEAR" < "2023" ]]
+            then
+              git tag -a -f $UNITY_VERSION-minsize-webgl1 -m "[Automated workflow] Created by upgrade-unity"
+              git tag -a -f $UNITY_VERSION-webgl1 -m "[Automated workflow] Created by upgrade-unity"
+            else
+              git tag -a -f $UNITY_VERSION-minsize-webgl2 -m "[Automated workflow] Created by upgrade-unity"
+            fi
             # Push tags in between - pushing more than 3 tags won't trigger tag workflows
             git push origin -f --tags
+
+            git tag -a -f $UNITY_VERSION-webgl2 -m "[Automated workflow] Created by upgrade-unity"
             git tag -a -f $UNITY_VERSION-webgl2-debug -m "[Automated workflow] Created by upgrade-unity"
           fi
 
           git push origin -f --tags
         env:
           UNITY_VERSION: ${{ inputs.unityVersion }}
-          URP_BRANCH: ${{ inputs.urp }}
 

Assets/Scripts/Editor/BuildScript.cs

@@ -23,8 +23,8 @@ namespace UnityBuilderAction
 	/// <summary>
 	/// Used for building the project through continuous integration (CI) or semi-automated through menu items
 	/// Supports logging in the editor and highly configurable WebGL
-	/// Modified version of <see href="https://github.com/game-ci/documentation/blob/main/example/BuildScript.cs">
-	/// Tailored to the needs for <see href="https://github.com/JohannesDeml/UnityWebGL-LoadingTest">
+	/// Modified version of <see href="https://github.com/game-ci/documentation/blob/main/example/BuildScript.cs" />
+	/// Tailored to the needs for <see href="https://github.com/JohannesDeml/UnityWebGL-LoadingTest" />
 	/// </summary>
 	public static class BuildScript
 	{
@@ -108,6 +108,10 @@ public static void Build(string[] args)
 #else
 							PlayerSettings.WebGL.debugSymbols = true;
 #endif
+
+#if UNITY_2022_2_OR_NEWER
+							PlayerSettings.WebGL.showDiagnostics = true;
+#endif
 							buildPlayerOptions.options |= BuildOptions.Development;
 						}
 						else

Assets/Scripts/Editor/UnityPackageScripts.cs

@@ -108,7 +108,9 @@ private static void UpdatePackages()
 
 				string latestVersion = IncludePrereleases ?
 					package.versions.latestCompatible :
-#if UNITY_2019_3_OR_NEWER
+#if UNITY_2022_3_OR_NEWER
+					package.versions.recommended;
+#elif UNITY_2019_3_OR_NEWER
 					package.versions.verified;
 #else
 					package.versions.recommended;
@@ -226,8 +228,24 @@ private static void EndUpdate(int returnValue)
 #if UNITY_2020_1_OR_NEWER
 			Progress.Finish(ProgressId, returnValue == 0 ? Progress.Status.Succeeded : Progress.Status.Failed);
 #endif
+			Debug.Log($"Updating unity packages finished with exit code {returnValue}");
+
 			if (Application.isBatchMode)
 			{
+				// Hack for unity-builder v3, since it is expecting a build result output
+				Console.WriteLine(
+					$"{Environment.NewLine}" +
+					$"###########################{Environment.NewLine}" +
+					$"#      Build results      #{Environment.NewLine}" +
+					$"###########################{Environment.NewLine}" +
+					$"{Environment.NewLine}" +
+					$"Duration: 0{Environment.NewLine}" +
+					$"Warnings: 0{Environment.NewLine}" +
+					$"Errors: 0{Environment.NewLine}" +
+					$"Size: 0 bytes{Environment.NewLine}" +
+					$"{Environment.NewLine}"
+				);
+
 				EditorApplication.Exit(returnValue);
 			}
 			else
@@ -236,8 +254,6 @@ private static void EndUpdate(int returnValue)
 				{
 					throw new Exception($"BuildScript ended with non-zero exitCode: {returnValue}");
 				}
-
-				Debug.Log($"Successfully updated packages");
 			}
 		}
 	}

Assets/WebGLTemplates/Develop/debug-console.js

@@ -1,3 +1,6 @@
+/// Processes all unity log messages and converts unity rich text to css styled console messages & adds a debug html debug console
+/// from https://github.com/JohannesDeml/UnityWebGL-LoadingTest
+
 let consoleDiv;
 let debugToggle;
 let logCounterDivs = {};

README.md

@@ -2,9 +2,9 @@
 
 ![Preview](./preview.png)
 
-[![](https://img.shields.io/github/release-date/JohannesDeml/UnityWebGL-LoadingTest.svg)](https://github.com/JohannesDeml/UnityWebGL-LoadingTest/releases) [![Tested up to Unity 2022.2](https://img.shields.io/badge/tested%20up%20to%20unity-2022.2-green.svg?logo=unity&cacheSeconds=2592000)](https://unity3d.com/get-unity/download/archive)
+[![](https://img.shields.io/github/release-date/JohannesDeml/UnityWebGL-LoadingTest.svg)](https://github.com/JohannesDeml/UnityWebGL-LoadingTest/releases) [![Tested up to Unity 2022.3](https://img.shields.io/badge/tested%20up%20to%20unity-2022.3-green.svg?logo=unity&cacheSeconds=2592000)](https://unity3d.com/get-unity/download/archive)
 
-*Testing Unity's WebGL size and loading time for different versions (2018.4 - 2022.2) and platforms*  
+*Testing Unity's WebGL size and loading time for different versions (2018.4 - 2022.3) and platforms*  
 
 * [Unity Forum Thread](https://forum.unity.com/threads/webgl-builds-for-mobile.545877/)
 * [Overview page of all builds](https://deml.io/experiments/unity-webgl/)
@@ -204,4 +204,4 @@ You can find a list of all live builds with their sizes over here: https://deml.
 
 ## License
 
-* MIT (c) Johannes Deml - see [LICENSE](./LICENSE.md)
+* MIT (c) Johannes Deml - see [LICENSE](./LICENSE.md)