Merge branch 'master' of https://github.com/JohannesDeml/UnityWebGL-LoadingTest into 2022.3

Author: JohannesDeml

.github/workflows/upgrade-unity.yml

@@ -137,7 +137,7 @@ jobs:
           customParameters: ${{ inputs.customParameters }}
           unityVersion: ${{ inputs.unityVersion }}
           targetPlatform: WebGL
-          buildName: ${{ needs.variables.outputs.BUILD_NAME }}
+          buildName: ${{ steps.upgrade_name.outputs.NAME }}
           allowDirtyBuild: true
           manualExit: true
 
@@ -169,7 +169,7 @@ jobs:
         if: ${{ inputs.createTags || inputs.tagsOnly }}
         run: |
           # Extract the first four characters of UNITY_VERSION
-          UNITY_YEAR=${UNITY_VERSION:0:4}
+          MAJOR_VERSION=${UNITY_VERSION:0:4}
           BRANCH_NAME=${GITHUB_REF#refs/heads/}
 
           TAG_PREFIX=$UNITY_VERSION
@@ -178,7 +178,7 @@ jobs:
             TAG_PREFIX=$UNITY_VERSION-urp
           fi
 
-          if [[ "$UNITY_YEAR" < "2023" ]]
+          if [[ "$MAJOR_VERSION" < "2023" ]]
           then
             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"
@@ -191,6 +191,11 @@ jobs:
           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"
 
+          if [[ "$MAJOR_VERSION" >= "6000" ]]
+          then
+            git tag -a -f $TAG_PREFIX-webgpu -m "[Automated workflow] Created by upgrade-unity"
+          fi
+
           git push origin -f --tags
         env:
           UNITY_VERSION: ${{ inputs.unityVersion }}

Assets/Scripts/Editor/BuildScript.cs

@@ -14,6 +14,7 @@
 using System.Linq;
 using JetBrains.Annotations;
 using UnityEditor;
+using UnityEditor.Build;
 using UnityEditor.Build.Reporting;
 using UnityEngine;
 using UnityEngine.Rendering;
@@ -31,6 +32,25 @@ public static class BuildScript
 		private static readonly string Eol = Environment.NewLine;
 		private static bool LogVerboseBatchMode = true;
 		private static bool LogVerboseInEditor = false;
+		private const string CodeOptimizationSpeed =
+#if UNITY_2021_3_OR_NEWER
+		"runtimespeedlto";
+#else
+		"speed";
+#endif
+		private const string CodeOptimizationSize =
+#if UNITY_2021_3_OR_NEWER
+		"disksizelto";
+#else
+		"size";
+#endif
+
+		private const string CodeOptimizationBuildTimes =
+#if UNITY_2021_3_OR_NEWER
+		"buildtimes";
+#else
+		"size";
+#endif
 
 		private static readonly string[] Secrets =
 			{ "androidKeystorePass", "androidKeyaliasName", "androidKeyaliasPass" };
@@ -84,6 +104,7 @@ public static void Build(string[] args)
 #if UNITY_2021_2_OR_NEWER
 					// Use ASTC texture compression, since we are also targeting mobile versions - Don't use this for desktop only targets
 					buildPlayerOptions.subtarget = (int)WebGLTextureSubtarget.ASTC;
+					var namedBuildTarget = NamedBuildTarget.WebGL;
 #endif
 
 					if (options.TryGetValue("tag", out string tagVersion) &&
@@ -93,17 +114,22 @@ public static void Build(string[] args)
 						if (tagParameters.Contains("minsize"))
 						{
 							PlayerSettings.WebGL.template = "PROJECT:Release";
-							SetWebGlOptimization("size");
+							SetWebGlOptimization(CodeOptimizationSize);
+							buildPlayerOptions.options |= BuildOptions.CompressWithLz4HC;
 							PlayerSettings.WebGL.exceptionSupport = WebGLExceptionSupport.None;
 							PlayerSettings.SetIl2CppCompilerConfiguration(BuildTargetGroup.WebGL, Il2CppCompilerConfiguration.Master);
+#if UNITY_2021_2_OR_NEWER
+							PlayerSettings.SetIl2CppCodeGeneration(namedBuildTarget, Il2CppCodeGeneration.OptimizeSize);
+#endif
 						}
 						else if (tagParameters.Contains("debug"))
 						{
 							PlayerSettings.WebGL.template = "PROJECT:Develop";
-							SetWebGlOptimization("size");
 							PlayerSettings.WebGL.exceptionSupport = WebGLExceptionSupport.FullWithStacktrace;
 							PlayerSettings.SetIl2CppCompilerConfiguration(BuildTargetGroup.WebGL, Il2CppCompilerConfiguration.Debug);
+							SetWebGlOptimization(CodeOptimizationBuildTimes);
 #if UNITY_2021_2_OR_NEWER
+							PlayerSettings.SetIl2CppCodeGeneration(namedBuildTarget, Il2CppCodeGeneration.OptimizeSize);
 							PlayerSettings.WebGL.debugSymbolMode = WebGLDebugSymbolMode.Embedded;
 #else
 							PlayerSettings.WebGL.debugSymbols = true;
@@ -117,8 +143,12 @@ public static void Build(string[] args)
 						else
 						{
 							PlayerSettings.WebGL.template = "PROJECT:Develop";
+							PlayerSettings.SetIl2CppCompilerConfiguration(BuildTargetGroup.WebGL, Il2CppCompilerConfiguration.Master);
 							// By default use the speed setting
-							SetWebGlOptimization("speed");
+							SetWebGlOptimization(CodeOptimizationSpeed);
+#if UNITY_2021_2_OR_NEWER
+							PlayerSettings.SetIl2CppCodeGeneration(namedBuildTarget, Il2CppCodeGeneration.OptimizeSpeed);
+#endif
 						}
 
 						List<GraphicsDeviceType> graphicsAPIs = new List<GraphicsDeviceType>();
@@ -155,7 +185,7 @@ public static void Build(string[] args)
 			// Additional options for local builds
 			if (!Application.isBatchMode)
 			{
-				if (options.TryGetValue("autorunplayer", out string autorunplayer))
+				if (options.TryGetValue("autorunplayer", out string _))
 				{
 					buildPlayerOptions.options |= BuildOptions.AutoRunPlayer;
 				}