Merge branch 'master' into 2022.2

# Conflicts:
#	Assets/Scripts/Editor/UnityPackageScripts.cs

Author: JohannesDeml

.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
       TAG: ${{ steps.set_tag.outputs.VERSION }}
       BUILD_NAME: ${{ steps.set_build_name.outputs.VERSION }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           lfs: true
@@ -55,7 +55,7 @@ jobs:
 
       - name: Version missmatch ❌
         if: ${{ !startsWith(needs.variables.outputs.TAG, needs.variables.outputs.UNITY_VERSION) }}
-        uses: actions/github-script@v3
+        uses: actions/github-script@v4
         with:
           script: |
               core.setFailed('Unity version does not match tag version')
@@ -69,7 +69,7 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           lfs: true
@@ -92,9 +92,11 @@ jobs:
           restore-keys: Library-201x-
 
       - name: Build project
-        uses: game-ci/unity-builder@v2
+        uses: game-ci/unity-builder@v4
         env:
           UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
         with:
           buildMethod: UnityBuilderAction.BuildScript.BuildWithCommandlineArgs
           customParameters: -tag ${{ needs.variables.outputs.TAG }}
@@ -136,7 +138,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - uses: actions/download-artifact@v3
         with:

.github/workflows/upgrade-unity.yml

@@ -14,11 +14,6 @@ on:
         required: false
         type: boolean
         default: true
-      urp:
-        description: 'URP branch'
-        required: true
-        type: boolean
-        default: false
       tagsOnly:
         description: 'Only create tags'
         required: true
@@ -44,21 +39,28 @@ 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 }}
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           lfs: true
@@ -80,6 +82,7 @@ jobs:
           git fetch origin master
           git merge FETCH_HEAD
           git push
+          git log -1
 
       # Unity 2020 cache is not compatible with older versions
       - name: Unity Library Cache 2020 or higher
@@ -107,15 +110,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,16 +127,19 @@ jobs:
 
       - name: Build project
         if: ${{ !inputs.tagsOnly }}
-        uses: JohannesDeml/unity-builder@no-quit-parameter
+        uses: game-ci/unity-builder@v4
         env:
           UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
         with:
           buildMethod: UnityBuilderAction.UnityPackageScripts.UpgradeAllPackagesToVerifiedVersion
           customParameters: ${{ inputs.customParameters }}
           unityVersion: ${{ inputs.unityVersion }}
           targetPlatform: WebGL
           buildName: ${{ needs.variables.outputs.BUILD_NAME }}
           allowDirtyBuild: true
+          manualExit: true
 
       - name: Delete build folder with elevated rights
         if: ${{ !inputs.tagsOnly }}
@@ -162,22 +168,30 @@ 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/}
+
+          TAG_PREFIX=$UNITY_VERSION
+          if [[ "$BRANCH_NAME" == *"urp"* ]]
+          then
+            TAG_PREFIX=$UNITY_VERSION-urp
+          fi
+
+          if [[ "$UNITY_YEAR" < "2023" ]]
           then
-            git tag -a -f $UNITY_VERSION-urp-webgl1 -m "[Automated workflow] Created by upgrade-unity"
-            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"
+            git tag -a -f $TAG_PREFIX-minsize-webgl1 -m "[Automated workflow] Created by upgrade-unity"
+            git tag -a -f $TAG_PREFIX-webgl1 -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"
-            # 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-debug -m "[Automated workflow] Created by upgrade-unity"
+            git tag -a -f $TAG_PREFIX-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 $TAG_PREFIX-webgl2 -m "[Automated workflow] Created by upgrade-unity"
+          git tag -a -f $TAG_PREFIX-webgl2-debug -m "[Automated workflow] Created by upgrade-unity"
 
           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
@@ -131,6 +135,13 @@ public static void Build(string[] args)
 						{
 							PlayerSettings.SetGraphicsAPIs(BuildTarget.WebGL, new[] { GraphicsDeviceType.OpenGLES2, GraphicsDeviceType.OpenGLES3 });
 						}
+
+						#if UNITY_2023_1_OR_NEWER
+						if (tagParameters.Contains("webgl1"))
+						{
+							Log("WebGL1 not supported anymore, choosing WebGL2 instead");
+						}
+						#endif
 					}
 
 					break;

Assets/Scripts/Editor/BuildScriptMenu.cs

@@ -25,11 +25,13 @@ public class BuildScriptMenu
 		{
 			"-projectPath", "",
 			"-buildVersion", PlayerSettings.bundleVersion,
-			"-androidVersionCode", PlayerSettings.Android.bundleVersionCode.ToString(CultureInfo.InvariantCulture)
+			"-androidVersionCode", PlayerSettings.Android.bundleVersionCode.ToString(CultureInfo.InvariantCulture),
 		};
 
+		// Unity 2023.1+ does not support webgl1 anymore
+		#if !UNITY_2023_1_OR_NEWER
 		[MenuItem("Tools/Build WebGL/webgl1")]
-		public static void BuildWebGLDefault()
+		public static void BuildWebGL1()
 		{
 			var parameters = new List<string>(baseParameters);
 			string tag = $"{Application.unityVersion}-webgl1-manualBuild";
@@ -41,8 +43,8 @@ public static void BuildWebGLDefault()
 			BuildWithParameters(parameters);
 		}
 
-		[MenuItem("Tools/Build WebGL/minsize")]
-		public static void BuildWebGLMinSize()
+		[MenuItem("Tools/Build WebGL/minsize-webgl1")]
+		public static void BuildWebGL1MinSize()
 		{
 			var parameters = new List<string>(baseParameters);
 			string tag = $"{Application.unityVersion}-minsize-webgl1-manualBuild";
@@ -53,12 +55,13 @@ public static void BuildWebGLMinSize()
 			SetParameterValue("-customBuildName", tag, ref parameters);
 			BuildWithParameters(parameters);
 		}
+		#endif
 
-		[MenuItem("Tools/Build WebGL/debug")]
-		public static void BuildWebGLDebug()
+		[MenuItem("Tools/Build WebGL/webgl2")]
+		public static void BuildWebGL2()
 		{
 			var parameters = new List<string>(baseParameters);
-			string tag = $"{Application.unityVersion}-debug-manualBuild";
+			string tag = $"{Application.unityVersion}-webgl2-manualBuild";
 			SetBuildTarget(BuildTarget.WebGL, ref parameters);
 			SetParameterValue("-autorunplayer", "true", ref parameters);
 			SetParameterValue("-tag", tag, ref parameters);
@@ -67,11 +70,24 @@ public static void BuildWebGLDebug()
 			BuildWithParameters(parameters);
 		}
 
-		[MenuItem("Tools/Build WebGL/webgl2")]
-		public static void BuildWebGLWebGL2()
+		[MenuItem("Tools/Build WebGL/minsize-webgl2")]
+		public static void BuildWebGL2MinSize()
 		{
 			var parameters = new List<string>(baseParameters);
-			string tag = $"{Application.unityVersion}-webgl2-manualBuild";
+			string tag = $"{Application.unityVersion}-minsize-webgl2-manualBuild";
+			SetBuildTarget(BuildTarget.WebGL, ref parameters);
+			SetParameterValue("-autorunplayer", "true", ref parameters);
+			SetParameterValue("-tag", tag, ref parameters);
+			SetParameterValue("-customBuildPath", $"Builds/WebGL/{tag}", ref parameters);
+			SetParameterValue("-customBuildName", tag, ref parameters);
+			BuildWithParameters(parameters);
+		}
+
+		[MenuItem("Tools/Build WebGL/debug")]
+		public static void BuildWebGLDebug()
+		{
+			var parameters = new List<string>(baseParameters);
+			string tag = $"{Application.unityVersion}-debug-manualBuild";
 			SetBuildTarget(BuildTarget.WebGL, ref parameters);
 			SetParameterValue("-autorunplayer", "true", ref parameters);
 			SetParameterValue("-tag", tag, ref parameters);

Assets/Scripts/Editor/UnityPackageScripts.cs

@@ -108,8 +108,10 @@ 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;
 #endif
@@ -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 = {};
@@ -18,10 +21,6 @@ if (getCookie("addTimestamp") === "false") {
   addTimestamp = false;
 }
 
-initializeToggleButton(false);
-initializeDebugConsole();
-
-
 function setCookie(cname, cvalue, exdays) {
   const d = new Date();
   d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000));
@@ -602,3 +601,19 @@ function refreshTrackingDiv() {
   innerHtml += '</dl>';
   trackingDiv.innerHTML = innerHtml;
 }
+
+// Polyfill for older browsers
+if (!String.prototype.replaceAll) {
+  String.prototype.replaceAll = function(str, newStr) {
+    if (str === '?')
+      str = '\\\\?';
+    return this.replace(str instanceof RegExp ? str : new RegExp(str, 'g'), newStr);
+  }
+}
+
+const urlParams = new URLSearchParams(window.location.search);
+const debugParam = urlParams.get('debug');
+const debug = debugParam === 'true';
+
+initializeToggleButton(debug);
+initializeDebugConsole();

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)