Revert "refactor: replace manual Unity license activation with game-ci/unity-activator"

This reverts commit e9520ee.

Author: msanatan

.github/workflows/claude-nl-suite.yml

@@ -67,53 +67,123 @@ jobs:
             echo "No MCP Python deps found (skipping)"
           fi
 
-      # --- Use game-ci for Unity activation (handles all license types) ---
-      - name: Activate Unity using game-ci
-        uses: game-ci/unity-activator@v2
+      # --- Licensing: allow both ULF and EBL when available ---
+      - name: Decide license sources
+        id: lic
+        shell: bash
         env:
+          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
           UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
-          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
           UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
-        with:
-          unity-version: 2021.3.45f2
+        run: |
+          set -eu
+          use_ulf=false; use_ebl=false
+          [[ -n "${UNITY_LICENSE:-}" ]] && use_ulf=true
+          [[ -n "${UNITY_EMAIL:-}" && -n "${UNITY_PASSWORD:-}" ]] && use_ebl=true
+          echo "use_ulf=$use_ulf" >> "$GITHUB_OUTPUT"
+          echo "use_ebl=$use_ebl" >> "$GITHUB_OUTPUT"
+          echo "has_serial=$([[ -n "${UNITY_SERIAL:-}" ]] && echo true || echo false)" >> "$GITHUB_OUTPUT"
+
+      - name: Stage Unity .ulf license (from secret)
+        if: steps.lic.outputs.use_ulf == 'true'
+        id: ulf
+        env:
+          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+        shell: bash
+        run: |
+          set -eu
+          mkdir -p "$RUNNER_TEMP/unity-license-ulf" "$RUNNER_TEMP/unity-local/Unity"
+          f="$RUNNER_TEMP/unity-license-ulf/Unity_lic.ulf"
+          if printf "%s" "$UNITY_LICENSE" | base64 -d - >/dev/null 2>&1; then
+            printf "%s" "$UNITY_LICENSE" | base64 -d - > "$f"
+          else
+            printf "%s" "$UNITY_LICENSE" > "$f"
+          fi
+          chmod 600 "$f" || true
+          # If someone pasted an entitlement XML into UNITY_LICENSE by mistake, re-home it:
+          if head -c 100 "$f" | grep -qi '<\?xml'; then
+            mkdir -p "$RUNNER_TEMP/unity-config/Unity/licenses"
+            mv "$f" "$RUNNER_TEMP/unity-config/Unity/licenses/UnityEntitlementLicense.xml"
+            echo "ok=false" >> "$GITHUB_OUTPUT"
+          elif grep -qi '<Signature>' "$f"; then
+            # provide it in the standard local-share path too
+            cp -f "$f" "$RUNNER_TEMP/unity-local/Unity/Unity_lic.ulf"
+            echo "ok=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "ok=false" >> "$GITHUB_OUTPUT"
+          fi
 
-      # Copy activation artifacts to Docker mount locations
-      - name: Prepare Unity license for Docker containers
+      # --- Activate via EBL inside the same Unity image (writes host-side entitlement) ---
+      - name: Activate Unity (EBL via container - host-mount)
+        if: steps.lic.outputs.use_ebl == 'true'
         shell: bash
+        env:
+          UNITY_IMAGE: ${{ env.UNITY_IMAGE }}
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
+          UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
         run: |
           set -euxo pipefail
+          # host dirs to receive the full Unity config and local-share
           mkdir -p "$RUNNER_TEMP/unity-config" "$RUNNER_TEMP/unity-local"
 
-          # game-ci stores license files in standard Unity locations
-          # Copy them to our Docker mount points
-          if [ -d "$HOME/.local/share/unity3d" ]; then
-            cp -r "$HOME/.local/share/unity3d"/* "$RUNNER_TEMP/unity-local/" || true
-          fi
-          if [ -d "$HOME/.config/unity3d" ]; then
-            cp -r "$HOME/.config/unity3d"/* "$RUNNER_TEMP/unity-config/" || true
+          # Try Pro first if serial is present, otherwise named-user EBL.
+          docker run --rm --network host \
+            -e HOME=/root \
+            -e UNITY_EMAIL -e UNITY_PASSWORD -e UNITY_SERIAL \
+            -v "$RUNNER_TEMP/unity-config:/root/.config/unity3d" \
+            -v "$RUNNER_TEMP/unity-local:/root/.local/share/unity3d" \
+            "$UNITY_IMAGE" bash -lc '
+              set -euxo pipefail
+              if [[ -n "${UNITY_SERIAL:-}" ]]; then
+                /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
+                  -username "$UNITY_EMAIL" -password "$UNITY_PASSWORD" -serial "$UNITY_SERIAL" -quit || true
+              else
+                /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
+                  -username "$UNITY_EMAIL" -password "$UNITY_PASSWORD" -quit || true
+              fi
+              ls -la /root/.config/unity3d/Unity/licenses || true
+            '
+
+          # Verify entitlement written to host mount; allow ULF-only runs to proceed
+          if ! find "$RUNNER_TEMP/unity-config" -type f -iname "*.xml" | grep -q .; then
+            if [[ "${{ steps.ulf.outputs.ok }}" == "true" ]]; then
+              echo "EBL entitlement not found; proceeding with ULF-only (ok=true)."
+            else
+              echo "No entitlement produced and no valid ULF; cannot continue." >&2
+              exit 1
+            fi
           fi
 
-          # Verify license files exist
-          echo "Unity license files prepared:"
-          find "$RUNNER_TEMP/unity-local" -type f || true
-          find "$RUNNER_TEMP/unity-config" -type f || true
+      # EBL entitlement is already written directly to $RUNNER_TEMP/unity-config by the activation step
 
       # ---------- Warm up project (import Library once) ----------
       - name: Warm up project (import Library once)
-        if: steps.detect.outputs.unity_ok == 'true'
+        if: steps.lic.outputs.use_ulf == 'true' || steps.lic.outputs.use_ebl == 'true'
         shell: bash
         env:
           UNITY_IMAGE: ${{ env.UNITY_IMAGE }}
+          ULF_OK: ${{ steps.ulf.outputs.ok }}
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
+          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
         run: |
           set -euxo pipefail
+          manual_args=()
+          if [[ "${ULF_OK:-false}" == "true" ]]; then
+            manual_args=(-manualLicenseFile "/root/.local/share/unity3d/Unity/Unity_lic.ulf")
+          fi
           docker run --rm --network host \
             -e HOME=/root \
+            -e UNITY_EMAIL="${UNITY_EMAIL:-}" \
+            -e UNITY_PASSWORD="${UNITY_PASSWORD:-}" \
             -v "${{ github.workspace }}:/workspace" -w /workspace \
             -v "$RUNNER_TEMP/unity-config:/root/.config/unity3d" \
             -v "$RUNNER_TEMP/unity-local:/root/.local/share/unity3d" \
             "$UNITY_IMAGE" /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
               -projectPath /workspace/TestProjects/UnityMCPTests \
+              "${manual_args[@]}" \
               -quit
 
       # ---------- Clean old MCP status ----------
@@ -125,16 +195,27 @@ jobs:
 
       # ---------- Start headless Unity (persistent bridge) ----------
       - name: Start Unity (persistent bridge)
-        if: steps.detect.outputs.unity_ok == 'true'
+        if: steps.lic.outputs.use_ulf == 'true' || steps.lic.outputs.use_ebl == 'true'
         shell: bash
         env:
           UNITY_IMAGE: ${{ env.UNITY_IMAGE }}
+          ULF_OK: ${{ steps.ulf.outputs.ok }}
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
+          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
         run: |
           set -euxo pipefail
+          manual_args=()
+          if [[ "${ULF_OK:-false}" == "true" ]]; then
+            manual_args=(-manualLicenseFile "/root/.local/share/unity3d/Unity/Unity_lic.ulf")
+          fi
+
           mkdir -p "$RUNNER_TEMP/unity-status"
           docker rm -f unity-mcp >/dev/null 2>&1 || true
           docker run -d --name unity-mcp --network host \
             -e HOME=/root \
+            -e UNITY_EMAIL="${UNITY_EMAIL:-}" \
+            -e UNITY_PASSWORD="${UNITY_PASSWORD:-}" \
             -e UNITY_MCP_ALLOW_BATCH=1 \
             -e UNITY_MCP_STATUS_DIR=/root/.unity-mcp \
             -e UNITY_MCP_BIND_HOST=127.0.0.1 \
@@ -145,6 +226,7 @@ jobs:
             "$UNITY_IMAGE" /opt/unity/Editor/Unity -batchmode -nographics -logFile - \
               -stackTraceLogType Full \
               -projectPath /workspace/TestProjects/UnityMCPTests \
+              "${manual_args[@]}" \
               -executeMethod MCPForUnity.Editor.MCPForUnityBridge.StartAutoConnect
 
       # ---------- Wait for Unity bridge ----------
@@ -885,7 +967,7 @@ jobs:
           docker rm -f unity-mcp || true
 
       - name: Return Pro license (if used)
-        if: always()
+        if: always() && steps.lic.outputs.use_ebl == 'true' && steps.lic.outputs.has_serial == 'true'
         uses: game-ci/unity-return-license@v2
         continue-on-error: true
         env: