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

JohannesDeml · JohannesDeml · commit 397ef635422f · 2023-12-06T21:45:02.000Z
diff --git a/.github/workflows/release.yml b/.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@v3
+        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:
diff --git a/.github/workflows/upgrade-unity.yml b/.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
@@ -107,15 +109,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,10 +126,11 @@ jobs:
 
       - name: Build project
         if: ${{ !inputs.tagsOnly }}
-        # TODO change this back to v3 once manual exit is supported there
-        uses: game-ci/unity-builder@main
+        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 }}
@@ -164,22 +167,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 }}
 
diff --git a/Assets/Scripts/Editor/BuildScript.cs b/Assets/Scripts/Editor/BuildScript.cs
@@ -135,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;
diff --git a/Assets/Scripts/Editor/BuildScriptMenu.cs b/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);
diff --git a/Assets/WebGLTemplates/Develop/debug-console.js b/Assets/WebGLTemplates/Develop/debug-console.js
@@ -21,7 +21,11 @@ if (getCookie("addTimestamp") === "false") {
   addTimestamp = false;
 }
 
-initializeToggleButton(false);
+const urlParams = new URLSearchParams(window.location.search);
+const debugParam = urlParams.get('debug');
+const debug = debugParam === 'true';
+
+initializeToggleButton(debug);
 initializeDebugConsole();
 
 

Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,13 @@ public static void Build(string[] args)`
`135`	`135`	`{`
`136`	`136`	`PlayerSettings.SetGraphicsAPIs(BuildTarget.WebGL, new[] { GraphicsDeviceType.OpenGLES2, GraphicsDeviceType.OpenGLES3 });`
`137`	`137`	`}`
	`138`	`+`
	`139`	`+ #if UNITY_2023_1_OR_NEWER`
	`140`	`+ if (tagParameters.Contains("webgl1"))`
	`141`	`+ {`
	`142`	`+ Log("WebGL1 not supported anymore, choosing WebGL2 instead");`
	`143`	`+ }`
	`144`	`+ #endif`
`138`	`145`	`}`
`139`	`146`
`140`	`147`	`break;`