Merge branch 'master' into 2022.2-urp

# Conflicts:
#	Packages/manifest.json
#	Packages/packages-lock.json
#	ProjectSettings/ProjectVersion.txt

Author: JohannesDeml

.github/scripts/add-tags.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+# This script creates tags for the given unity version to trigger the release workflow
+# example usage
+# sh add-tags.sh "6000.0.0f1" -> Creates tags for non-urp version
+# sh add-tags.sh "6000.0.0f1" "true" -> Creates tags for urp version
+
+# Input parameters
+UNITY_VERSION=$1
+IS_URP=${2:-"false"}
+echo "Running add_tags.sh with UNITY_VERSION: $UNITY_VERSION, IS_URP: $IS_URP"
+
+# Extract the value before the first dot as an integer
+MAJOR_VERSION=$(echo $UNITY_VERSION | cut -d. -f1)
+BRANCH_NAME=${GITHUB_REF#refs/heads/}
+
+TAG_PREFIX=$UNITY_VERSION
+if [[ "$IS_URP" == "true" ]]
+then
+TAG_PREFIX=$UNITY_VERSION-urp
+fi
+
+if [[ "$MAJOR_VERSION" -lt "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"
+else
+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"
+
+if [[ "$MAJOR_VERSION" -ge "6000" ]]
+then
+git tag -a -f $TAG_PREFIX-webgpu -m "[Automated workflow] Created by upgrade-unity"
+fi
+
+git push origin -f --tags

.github/templates/upgrade-unity-pr-body.md

@@ -5,7 +5,8 @@
 ### Built version demos
 
 * https://deml.io/experiments/unity-webgl/{{ .unityversion }}-webgl2
-* https://deml.io/experiments/unity-webgl/{{ .unityversion }}-webgl1
+* https://deml.io/experiments/unity-webgl/{{ .unityversion }}-webgl2-debug
+* https://deml.io/experiments/unity-webgl/{{ .unityversion }}-minsize-webgl2
 
 ### Other links
 

.github/workflows/activation.yml

@@ -5,6 +5,8 @@ on:
   push:
     tags:
       - '*'
+    branches:
+      - master
 
 jobs:
   variables:
@@ -28,7 +30,12 @@ jobs:
 
       - name: Set tag
         id: set_tag
-        run: echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
+        run: |
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
+          else
+            echo "VERSION=${{ steps.set_unity_version.outputs.VERSION }}-webgl2-master" >> $GITHUB_OUTPUT
+          fi
 
       - name: Set target name
         id: set_build_name
@@ -62,30 +69,40 @@ jobs:
 
   buildProject:
     name: Create Unity WebGL Build 🏗
-    # only build with additional parameters, the tag alone should only create a release draft
-    if: ${{ needs.variables.outputs.TAG != needs.variables.outputs.UNITY_VERSION }}
+    # Build if it's a master push or if the tag is not just the unity version
+    if: ${{ github.ref == 'refs/heads/master' || needs.variables.outputs.TAG != needs.variables.outputs.UNITY_VERSION }}
     needs: [ variables ]
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           lfs: true
 
+      # Avoid running into space issues for github runners - Docker images can take up quite some space
+      - name: Free Disk Space
+        run: |
+          echo "Disk space before cleanup:"
+          df -h
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf /usr/local/share/boost
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+          echo "Disk space after cleanup:"
+          df -h
+
       # Unity 2020 cache is not compatible with older versions
       - name: Unity Library Cache 2020 or higher
         if: ${{ !startsWith(needs.variables.outputs.UNITY_VERSION, '201') }}
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: Library
           key: Library-202x-WebGL
           restore-keys: Library-202x-
 
       - name: Unity Library Cache 2019 or lower
         if: ${{ startsWith(needs.variables.outputs.UNITY_VERSION, '201') }}
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: Library
           key: Library-201x-WebGL
@@ -101,22 +118,34 @@ jobs:
           buildMethod: UnityBuilderAction.BuildScript.BuildWithCommandlineArgs
           customParameters: -tag ${{ needs.variables.outputs.TAG }}
           targetPlatform: WebGL
+          versioning: None
           buildName: ${{ needs.variables.outputs.BUILD_NAME }}
 
-      - uses: actions/upload-artifact@v3
+      - name: Check Disk Space After Build
+        run: |
+          echo "Disk space after build:"
+          df -h
+          AVAILABLE=$(df / | tail -1 | awk '{print $4}')
+          AVAILABLE_GB=$(echo $AVAILABLE | sed 's/G//')
+          echo "Available space: ${AVAILABLE_GB}GB"
+          if (( $(echo "$AVAILABLE_GB < 1" | bc -l) )); then
+            echo "::warning::Low disk space! Less than 1GB remaining."
+          fi
+
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ needs.variables.outputs.BUILD_NAME }}
           path: build/WebGL
 
   createRelease:
     name: Create Github release 🐙
     # only run for the pure tag without build parameters
-    if: ${{ needs.variables.outputs.TAG == needs.variables.outputs.UNITY_VERSION }}
+    if: ${{ github.ref_type == 'tag' && needs.variables.outputs.TAG == needs.variables.outputs.UNITY_VERSION }}
     needs: [ variables ]
     runs-on: ubuntu-latest
     steps:
       - name: Create Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           body: |
             ## Changes
@@ -140,7 +169,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: ${{ needs.variables.outputs.BUILD_NAME }}
           path: build
@@ -150,7 +179,7 @@ jobs:
         working-directory: build/${{ needs.variables.outputs.BUILD_NAME }}
 
       - name: Deploy ⤴
-        uses: SamKirkland/FTP-Deploy-Action@4.3.3
+        uses: SamKirkland/FTP-Deploy-Action@v4.3.5
         with:
           server: ${{ secrets.FTP_SERVER }}
           username: ${{ secrets.FTP_USER }}

.github/workflows/release.yml

@@ -29,13 +29,16 @@ on:
         required: false
         type: string
         default: '-accept-apiupdate'
+      delayTags:
+        description: 'Delay before force pushing tags (in minutes)'
+        required: false
+        type: number
+        default: 0
 
 jobs:
   upgrade-unity-version:
-    name: Upgrade Unity version and packages
+    name: Upgrade Unity version and packages to ${{ inputs.unityVersion }}
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
     steps:
       - name: Log input parameter
         run: |
@@ -47,6 +50,7 @@ jobs:
           echo "Only create tags: $TAGS_ONLY"
           echo "Merge master into branch: $MERGE_MASTER"
           echo "Custom cli arguments: $CUSTOM_PARAMETERS"
+          echo "Delay tags: $DELAY_TAGS minutes"
           if [[ "$BRANCH_NAME" == *"urp"* ]]
           then
             echo "urp: true"
@@ -59,6 +63,7 @@ jobs:
           TAGS_ONLY: ${{ inputs.tagsOnly }}
           MERGE_MASTER: ${{ inputs.mergeMaster }}
           CUSTOM_PARAMETERS: ${{ inputs.customParameters }}
+          DELAY_TAGS: ${{ inputs.delayTags }}
 
       - uses: actions/checkout@v4
         with:
@@ -75,6 +80,18 @@ jobs:
         env:
           GIT_USER: ${{ github.actor }}
 
+      # Avoid running into space issues for github runners - Docker images can take up quite some space
+      - name: Free Disk Space
+        run: |
+          echo "Disk space before cleanup:"
+          df -h
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf /usr/local/share/boost
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+          echo "Disk space after cleanup:"
+          df -h
+
       # Make sure the branch has the latest master changes in
       - name: Merge master into current branch
         if: ${{ inputs.mergeMaster }}
@@ -87,15 +104,15 @@ jobs:
       # Unity 2020 cache is not compatible with older versions
       - name: Unity Library Cache 2020 or higher
         if: ${{ !startsWith(inputs.unityVersion, '201') }}
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: Library
           key: Library-202x-WebGL
           restore-keys: Library-202x-
 
       - name: Unity Library Cache 2019 or lower
         if: ${{ startsWith(inputs.unityVersion, '201') }}
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: Library
           key: Library-201x-WebGL
@@ -106,6 +123,13 @@ jobs:
         run: |
           LAST_UNITY_VERSION=$(sed -n 's/^\m_EditorVersion: //p'< ./ProjectSettings/ProjectVersion.txt)
           echo "VERSION=$LAST_UNITY_VERSION" >> $GITHUB_OUTPUT
+          BRANCH_NAME=${GITHUB_REF#refs/heads/}
+          if [[ "$BRANCH_NAME" == *"urp"* ]]
+          then
+            echo "NAME=$LAST_UNITY_VERSION-urp" >> $GITHUB_OUTPUT
+          else
+            echo "NAME=$LAST_UNITY_VERSION" >> $GITHUB_OUTPUT
+          fi
 
       - name: Set upgrade name
         id: upgrade_name
@@ -123,6 +147,7 @@ jobs:
       - name: Log variables
         run: |
           echo "last_unity_version -> ${{ steps.last_unity_version.outputs.VERSION }}"
+          echo "last_unity_name -> ${{ steps.last_unity_version.outputs.NAME }}"
           echo "upgrade_name -> ${{ steps.upgrade_name.outputs.NAME }}"
 
       - name: Build project
@@ -137,18 +162,30 @@ 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
 
+      - name: Check Disk Space After Build
+        if: ${{ !inputs.tagsOnly }}
+        run: |
+          echo "Disk space after build:"
+          df -h
+          AVAILABLE=$(df / | tail -1 | awk '{print $4}')
+          AVAILABLE_GB=$(echo $AVAILABLE | sed 's/G//')
+          echo "Available space: ${AVAILABLE_GB}GB"
+          if (( $(echo "$AVAILABLE_GB < 1" | bc -l) )); then
+            echo "::warning::Low disk space! Less than 1GB remaining."
+          fi
+
       - name: Delete build folder with elevated rights
         if: ${{ !inputs.tagsOnly }}
         run: sudo rm -rf ./build
 
       - name: Render template
         if: ${{ !inputs.tagsOnly }}
         id: template
-        uses: chuhlomin/render-template@v1.4
+        uses: chuhlomin/render-template@v1.9
         with:
           template: .github/templates/upgrade-unity-pr-body.md
           vars: |
@@ -159,39 +196,34 @@ jobs:
         uses: peter-evans/create-pull-request@v4
         with:
           token: ${{ secrets.PR_GITHUB_TOKEN }}
-          commit-message: "[Automated workflow] upgrade-unity from ${{steps.last_unity_version.outputs.VERSION}} to ${{ inputs.unityVersion }}"
-          branch: "ci/upgrade-unity/from-${{steps.last_unity_version.outputs.VERSION}}-to-${{ steps.upgrade_name.outputs.NAME }}"
+          commit-message: "[Automated workflow] upgrade-unity from ${{steps.last_unity_version.outputs.NAME}} to ${{ inputs.unityVersion }}"
+          branch: "ci/upgrade-unity/from-${{steps.last_unity_version.outputs.NAME}}-to-${{ steps.upgrade_name.outputs.NAME }}"
           delete-branch: true
-          title: "[Automated workflow] upgrade-unity from ${{steps.last_unity_version.outputs.VERSION}} to ${{ steps.upgrade_name.outputs.NAME }}"
+          title: "[Automated workflow] upgrade-unity from ${{steps.last_unity_version.outputs.NAME}} to ${{ steps.upgrade_name.outputs.NAME }}"
           body: ${{ steps.template.outputs.result }}
 
+      - name: Wait before pushing tags
+        if: ${{ (inputs.createTags || inputs.tagsOnly) && inputs.delayTags > 0 }}
+        run: |
+          DELAY_SECONDS=$((DELAY_TAGS * 60))
+          echo "Waiting for $DELAY_TAGS minutes ($DELAY_SECONDS seconds) before pushing tags..."
+          sleep $DELAY_SECONDS
+          echo "Wait complete. Proceeding with tag push."
+        env:
+          DELAY_TAGS: ${{ inputs.delayTags }}
+
       - name: Add tags
         if: ${{ inputs.createTags || inputs.tagsOnly }}
         run: |
-          # 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
+          IS_URP=false
+          if [[ "$BRANCH_NAME" == *"urp"* ]]; then
+            IS_URP=true
           fi
 
-          if [[ "$UNITY_YEAR" < "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"
-          else
-            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
+          # Run add tags script
+          ./.github/scripts/add-tags.sh "$UNITY_VERSION" "$IS_URP"
         env:
           UNITY_VERSION: ${{ inputs.unityVersion }}