Retry unity installation in Python script instead of using GHA (#527)

\

Author: sunmou99

.github/workflows/build_android.yml

@@ -103,7 +103,8 @@ jobs:
           pip install -r scripts/gha/requirements.txt
       
       - id: unity_setup
-        uses: firebase/firebase-unity-sdk/gha/unity@main
+        uses: ./gha/unity
+        timeout-minutes: 30
         with:
           version: ${{ inputs.unity_version }}
           platforms: ${{ inputs.unity_platform_name }}

.github/workflows/build_ios.yml

@@ -82,7 +82,8 @@ jobs:
           pip install -r scripts/gha/requirements.txt
       
       - id: unity_setup
-        uses: firebase/firebase-unity-sdk/gha/unity@main
+        uses: ./gha/unity
+        timeout-minutes: 30
         with:
           version: ${{ inputs.unity_version }}
           platforms: ${{ inputs.unity_platform_name }}

.github/workflows/build_linux.yml

@@ -84,7 +84,8 @@ jobs:
           sudo apt install openssl
 
       - id: unity_setup
-        uses: firebase/firebase-unity-sdk/gha/unity@main
+        uses: ./gha/unity
+        timeout-minutes: 30
         with:
           version: ${{ inputs.unity_version }}
           platforms: ${{ inputs.unity_platform_name }}

.github/workflows/build_macos.yml

@@ -98,7 +98,8 @@ jobs:
           echo "OPENSSL_ROOT_DIR=$(brew --prefix openssl --installed)" >> $GITHUB_ENV
 
       - id: unity_setup
-        uses: firebase/firebase-unity-sdk/gha/unity@main
+        uses: ./gha/unity
+        timeout-minutes: 30
         with:
           version: ${{ inputs.unity_version }}
           platforms: ${{ inputs.unity_platform_name }}

.github/workflows/build_tvos.yml

@@ -109,7 +109,8 @@ jobs:
           pod repo add cocoapods https://github.com/CocoaPods/Specs.git
 
       - id: unity_setup
-        uses: firebase/firebase-unity-sdk/gha/unity@main
+        uses: ./gha/unity
+        timeout-minutes: 30
         with:
           version: ${{ inputs.unity_version }}
           platforms: ${{ inputs.unity_platform_name }}

.github/workflows/build_windows.yml

@@ -90,7 +90,8 @@ jobs:
           choco install openssl -r
 
       - id: unity_setup
-        uses: firebase/firebase-unity-sdk/gha/unity@main
+        uses: ./gha/unity
+        timeout-minutes: 30
         with:
           version: ${{ inputs.unity_version }}
           platforms: ${{ inputs.unity_platform_name }}

.github/workflows/integration_tests.yml

@@ -185,7 +185,8 @@ jobs:
         if: runner.os == 'macOS'
         run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer
       - id: unity_setup
-        uses: firebase/firebase-unity-sdk/gha/unity@main
+        uses: ./gha/unity
+        timeout-minutes: 30
         with:
           version: ${{ matrix.unity_version }}
           platforms: ${{ matrix.platform }}
@@ -228,7 +229,7 @@ jobs:
       - name: Return Unity license
         # Always returns true, even when job failed or canceled. But will not run when a critical failure prevents the task from running. 
         if: always()
-        uses: firebase/firebase-unity-sdk/gha/unity@main
+        uses: ./gha/unity
         with:
           version: ${{ matrix.unity_version }}
           release_license: "true"
@@ -358,7 +359,8 @@ jobs:
         run: |
           pip install -r scripts/gha/requirements.txt
       - id: unity_setup
-        uses: firebase/firebase-unity-sdk/gha/unity@main
+        uses: ./gha/unity
+        timeout-minutes: 30
         with:
           version: ${{ matrix.unity_version }}
           username: ${{ secrets.UNITY_USERNAME }}
@@ -397,7 +399,7 @@ jobs:
       - name: Return Unity license
         # Always returns true, even when job failed or canceled. But will not run when a critical failure prevents the task from running. 
         if: always()
-        uses: firebase/firebase-unity-sdk/gha/unity@main
+        uses: ./gha/unity
         with:
           version: ${{ matrix.unity_version }}
           release_license: "true"

gha/unity/action.yml

@@ -65,18 +65,14 @@ runs:
     - id: unity_installation
       name: Install Unity
       if: inputs.release_license == ''
-      uses: nick-invision/retry@v2
-      with:
-        timeout_minutes: 12
-        max_attempts: 2
-        shell: bash
-        command: |
-          if [[ -n "${{ inputs.platforms }}" ]]; then
-            additional_flags+=(--platforms ${{ inputs.platforms }})
-          fi
-          unity_info=$( python $GITHUB_ACTION_PATH/unity_installer.py --install --version ${{ inputs.version }} ${additional_flags[*]} )
-          echo "UNITY_ROOT_DIR=$(cut -d',' -f2 <<< ${unity_info})" >> $GITHUB_ENV
-          echo "unity_version=$(cut -d',' -f1 <<< ${unity_info})" >> $GITHUB_OUTPUT
+      shell: bash
+      run: |
+        if [[ -n "${{ inputs.platforms }}" ]]; then
+          additional_flags+=(--platforms ${{ inputs.platforms }})
+        fi
+        unity_info=$( python $GITHUB_ACTION_PATH/unity_installer.py --install --version ${{ inputs.version }} ${additional_flags[*]} )
+        echo "UNITY_ROOT_DIR=$(cut -d',' -f2 <<< ${unity_info})" >> $GITHUB_ENV
+        echo "unity_version=$(cut -d',' -f1 <<< ${unity_info})" >> $GITHUB_OUTPUT
     - name: Activate Unity license
       if: inputs.release_license == '' && inputs.username != '' && inputs.password != '' && inputs.serial_ids != ''
       shell: bash

gha/unity/unity_installer.py

@@ -82,6 +82,7 @@
 
 
 _CMD_TIMEOUT = 900
+_MAX_ATTEMPTS = 3
 
 _DEFALUT = "Default"
 _ANDROID = "Android"
@@ -172,7 +173,6 @@ def main(argv):
     raise app.UsageError("Too many command-line arguments.")
 
   if FLAGS.install:
-    uninstall_unity(FLAGS.version)
     install_unity(FLAGS.version, FLAGS.platforms)
 
   if FLAGS.activate_license:
@@ -209,9 +209,24 @@ def install_unity(unity_version, platforms):
   u3d = find_u3d()
   run([u3d, "available", "-u", unity_version], check=False)
   run([u3d, "available", "-u", unity_full_version, "-p"], check=False)
-  run([u3d, "install", "--trace",
+  attempt_num = 1
+  while attempt_num <= _MAX_ATTEMPTS:
+    uninstall_unity(unity_version)
+    args = [u3d, "install", "--trace",
        "--verbose", unity_full_version,
-       "-p", package_csv])
+       "-p", package_csv]
+    logging.info("run_with_retry: %s (attempt %s of %s)", args, attempt_num, _MAX_ATTEMPTS)
+    try:
+      run(args)
+    except subprocess.SubprocessError:
+      logging.exception("run_with_retry: %s (attempt %s of %s) FAILED", args, attempt_num, _MAX_ATTEMPTS)
+      # If retries have been exhausted, just raise the exception
+      if attempt_num >= _MAX_ATTEMPTS:
+        raise
+    else:
+      break
+    attempt_num += 1
+  
   logging.info("Finished installing Unity.")
 
   unity_path = get_unity_path(unity_version)
@@ -324,8 +339,8 @@ def run(args, check=True, timeout=_CMD_TIMEOUT):
   """Runs args in a subprocess, throwing an error on non-zero return code."""
   logging.info("run cmd: %s", " ".join(args))
   result = subprocess.run(args=args, check=check, timeout=timeout, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-  logging.info(result.stdout)
-  logging.info(result.stderr)
+  logging.info("cmd result.stdout: %s", result.stdout)
+  logging.info("cmd result.stderr: %s", result.stderr)
 
 
 if __name__ == "__main__":