Merge branch 'master' into 2022.3

Author: JohannesDeml

.github/scripts/add-tags.sh

@@ -3,11 +3,14 @@
 # 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
+# sh add-tags.sh "6000.0.0f1" "true" "10" -> Creates tags for urp version with 10 second delay between pushes
 
 # Input parameters
 UNITY_VERSION=$1
 IS_URP=${2:-"false"}
-echo "Running add_tags.sh with UNITY_VERSION: $UNITY_VERSION, IS_URP: $IS_URP"
+DELAY_TAGS=${3:-"0"}
+
+echo "Running add_tags.sh with UNITY_VERSION: $UNITY_VERSION, IS_URP: $IS_URP, DELAY_TAGS: $DELAY_TAGS seconds"
 
 # Extract the value before the first dot as an integer
 MAJOR_VERSION=$(echo $UNITY_VERSION | cut -d. -f1)
@@ -19,22 +22,42 @@ then
 TAG_PREFIX=$UNITY_VERSION-urp
 fi
 
+# Build array of tags to create and push
+TAGS=()
+
 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"
+TAGS+=("$TAG_PREFIX-minsize-webgl1")
+TAGS+=("$TAG_PREFIX-webgl1")
 else
-git tag -a -f $TAG_PREFIX-minsize-webgl2 -m "[Automated workflow] Created by upgrade-unity"
+TAGS+=("$TAG_PREFIX-minsize-webgl2")
 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"
+TAGS+=("$TAG_PREFIX-webgl2")
+TAGS+=("$TAG_PREFIX-webgl2-debug")
 
 if [[ "$MAJOR_VERSION" -ge "6000" ]]
 then
-git tag -a -f $TAG_PREFIX-webgpu -m "[Automated workflow] Created by upgrade-unity"
+TAGS+=("$TAG_PREFIX-webgpu")
 fi
 
-git push origin -f --tags
+# Loop through tags, create and push each one with delay
+for i in "${!TAGS[@]}"; do
+  TAG="${TAGS[$i]}"
+  echo "Creating and pushing tag: $TAG"
+
+  # Create the tag
+  git tag -a -f "$TAG" -m "[Automated workflow] Created by upgrade-unity"
+
+  # Push the tag
+  git push origin -f "$TAG"
+
+  # Wait between pushes if not the last tag and delay is specified
+  if [[ $i -lt $((${#TAGS[@]} - 1)) ]] && [[ "$DELAY_TAGS" -gt "0" ]]
+  then
+    echo "Waiting $DELAY_TAGS seconds before next tag push..."
+    sleep $DELAY_TAGS
+  fi
+done
+
+echo "All tags created and pushed successfully."

.github/workflows/upgrade-unity.yml

@@ -29,6 +29,11 @@ on:
         required: false
         type: string
         default: '-accept-apiupdate'
+      delayTags:
+        description: 'Delay between tag pushes (in seconds, minimum 1)'
+        required: false
+        type: number
+        default: 1
 
 jobs:
   upgrade-unity-version:
@@ -45,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 seconds"
           if [[ "$BRANCH_NAME" == *"urp"* ]]
           then
             echo "urp: true"
@@ -57,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:
@@ -205,8 +212,9 @@ jobs:
             IS_URP=true
           fi
 
-          # Run add tags script
-          ./.github/scripts/add-tags.sh "$UNITY_VERSION" "$IS_URP"
+          # Run add tags script with delay parameter
+          ./.github/scripts/add-tags.sh "$UNITY_VERSION" "$IS_URP" "$DELAY_TAGS"
         env:
           UNITY_VERSION: ${{ inputs.unityVersion }}
+          DELAY_TAGS: ${{ inputs.delayTags }}