fix: streamline Unity build command for VRChat world #minor

Author: BenjiThatFoxGuy

.github/workflows/vrchat-world-ci.yml

@@ -20,23 +20,35 @@ concurrency:
 jobs:
   build-and-upload-nightly-world:
     runs-on: ubuntu-latest
-
+    timeout-minutes: 30
     env:
-      unity-docker-image-linux: unityci/editor:ubuntu-2022.3.22f1-windows-mono-3.1.0
-      unity-docker-image-windows: unityci/editor:windows-2022.3.22f1-windows-il2cpp-3.1.0
       workspace-path: "${{ github.workspace }}"
       source-path: "${{ github.workspace }}"
       release-path: "${{ github.workspace }}/tmp/release"
       add-packages-script-path: "${{ github.workspace }}/.github/workflow-scripts/add-user-package-to-vrc-get.js"
       get-serial-script-path: "${{ github.workspace }}/.github/workflow-scripts/get-serial-from-license-file.js"
       UNITY_SERIAL: XXXXX-XXXXX-XXXXX-XXXXX-XXXXX
-
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-          
+
+      - name: Cache Unity Installation
+        id: cache-unity-installation
+        uses: actions/cache@v4
+        with:
+          path: /home/runner/Unity/
+          key: unity-installation-2022.3.22f1-887be4894c44
+
+      - name: Set up Unity
+        if: steps.cache-unity-installation.outputs.cache-hit != 'true'
+        id: unity-setup
+        uses: buildalon/unity-setup@v1.0.20
+        with:
+          unity-version: 2022.3.22f1 (887be4894c44)
+          modules: windows-il2cpp, ios, android 
+
       - name: Download Release Package
         uses: robinraju/release-downloader@a96f54c1b5f5e09e47d9504526e96febd949d4c2
         if: github.event_name == 'release'
@@ -50,10 +62,7 @@ jobs:
       - name: Setup vrc-get
         uses: anatawa12/sh-actions/setup-vrc-get@master
 
-      - name: Set up Unity
-        if: runner.os == 'Linux'
-        run: |
-          docker pull "${{ env.unity-docker-image-linux }}"
+      # Unity setup is now handled by buildalon/unity-setup@v1.0.20
 
       - name: Add Release Pacakge to vrc-get
         if: github.event_name == 'release'
@@ -147,6 +156,8 @@ jobs:
           vrc-get remove dev.hai-vr.resilience.let-me-see -y || true
           vrc-get remove dev.hai-vr.resilience.toolkit -y || true
           vrc-get remove unity-editor-dark-mode -y || true
+          vrc-get remove au.benjithatfoxguy.uerp || true
+          vrc-get remove au.benjithatfoxguy.simplebuttonsui || true
           rm -rf Assets/Editor || true
           rm -rf Assets/Editor.meta || true
           rm -rf Assets/UERP || true
@@ -182,13 +193,13 @@ jobs:
           $ErrorActionPreference = "SilentlyContinue"
           vrc-get install com.yuxiaviation.vrchat.autobuild.world -y
 
-      - name: Downgrade VRCSDK to 3.7.1
-        working-directory: ${{ env.workspace-path }}
-        run: |
-          vrc-get remove com.vrchat.worlds -y
-          vrc-get remove com.vrchat.base -y
-          vrc-get install com.vrchat.worlds 3.7.1 -y
-          vrc-get install com.vrchat.base 3.7.1 -y
+      # - name: Downgrade VRCSDK to 3.7.1
+      #   working-directory: ${{ env.workspace-path }}
+      #   run: |
+      #     vrc-get remove com.vrchat.worlds -y
+      #     vrc-get remove com.vrchat.base -y
+      #     vrc-get install com.vrchat.worlds 3.7.1 -y
+      #     vrc-get install com.vrchat.base 3.7.1 -y
 
       - name: Cache Library
         uses: actions/cache@v4
@@ -219,59 +230,32 @@ jobs:
 
       - name: Build & Upload VRChat World
         if: runner.os == 'Linux'
+        continue-on-error: true
         run: |
-          docker run \
-            -v "${{ env.workspace-path }}:/project" \
-            -v "${{ github.workspace }}/tmp:/tmp/DefaultCompany/" \
-            -e VRC_AUTO_BUILD_USERNAME="${VRC_AUTO_BUILD_USERNAME}" \
-            -e VRC_AUTO_BUILD_PASSWORD="${VRC_AUTO_BUILD_PASSWORD}" \
-            -e VRC_AUTO_BUILD_TOTP_KEY="${VRC_AUTO_BUILD_TOTP_KEY}" \
-            -e VRC_AUTO_BUILD_SCENE_PATH="${VRC_AUTO_BUILD_SCENE_PATH}" \
-            -e VRC_AUTO_BUILD_CONTENT_ID="${VRC_AUTO_BUILD_CONTENT_ID}" \
-            -e VRC_AUTO_BUILD_AUTH_COOKIE="${VRC_AUTO_BUILD_AUTH_COOKIE}" \
-            -e VRC_AUTO_BUILD_TWO_FACTOR_AUTH_COOKIE="${VRC_AUTO_BUILD_TWO_FACTOR_AUTH_COOKIE}" \
-            "${{ env.unity-docker-image-linux }}" \
-            unity-editor -projectPath /project \
-            -username "${{ secrets.UNITY_EMAIL }}" \
-            -password "${{ secrets.UNITY_PASSWORD }}" \
-            -serial "${{ env.UNITY_SERIAL }}" \
-            -batchmode -logFile - \
-            -buildTarget Win64 \
-            -executeMethod VRChatAerospaceUniversity.VRChatAutoBuild.Worlds.AutoBuildVRChatWorld.BuildAndUploadWorld
+          "/home/runner/Unity/Hub/Editor/2022.3.22f1/Editor/Unity" -headless -projectPath "${{ env.workspace-path }}" -username "${{ secrets.UNITY_EMAIL }}" -password "${{ secrets.UNITY_PASSWORD }}" -serial "${{ env.UNITY_SERIAL }}" -batchmode -logFile - -buildTarget Win64 -executeMethod VRChatAerospaceUniversity.VRChatAutoBuild.Worlds.AutoBuildVRChatWorld.BuildAndUploadWorld -quit
         env:
-          # VRC_AUTO_BUILD_SCENE_PATH: ${{ env.WORKSPACE_SCENE_PATH }}
-          # VRC_AUTO_BUILD_CONTENT_ID: "wrld_67ed4bef-8dba-4e87-89e0-129030e65be7"
           VRC_AUTO_BUILD_CONTENT_ID: ${{ secrets.NIGHTLY_WORLD_CONTENT_ID }}
           VRC_AUTO_BUILD_SCENE_PATH: Assets\Scenes\VRCDefaultWorldScene.unity
           VRC_AUTO_BUILD_USERNAME: ${{ secrets.VRC_AUTO_BUILD_USERNAME }}
           VRC_AUTO_BUILD_PASSWORD: ${{ secrets.VRC_AUTO_BUILD_PASSWORD }}
           VRC_AUTO_BUILD_TOTP_KEY: ${{ secrets.VRC_AUTO_BUILD_TOTP_KEY }}
           VRC_AUTO_BUILD_AUTH_COOKIE: ${{ secrets.VRC_AUTO_BUILD_AUTH_COOKIE }}
           VRC_AUTO_BUILD_TWO_FACTOR_AUTH_COOKIE: ${{ secrets.VRC_AUTO_BUILD_TWO_FACTOR_AUTH_COOKIE }}
+          DISPLAY: ":0"
 
       - name: Build & Upload VRChat World
         if: runner.os == 'Windows'
+        shell: pwsh
         run: |
-          docker run `
-            -v "${{ env.workspace-path }}:C:\Project" `
-            -e VRC_AUTO_BUILD_USERNAME="${VRC_AUTO_BUILD_USERNAME}" `
-            -e VRC_AUTO_BUILD_PASSWORD="${VRC_AUTO_BUILD_PASSWORD}" `
-            -e VRC_AUTO_BUILD_TOTP_KEY="${VRC_AUTO_BUILD_TOTP_KEY}" `
-            -e VRC_AUTO_BUILD_SCENE_PATH="${VRC_AUTO_BUILD_SCENE_PATH}" `
-            -e VRC_AUTO_BUILD_CONTENT_ID="${VRC_AUTO_BUILD_CONTENT_ID}" `
-            -e VRC_AUTO_BUILD_AUTH_COOKIE="${VRC_AUTO_BUILD_AUTH_COOKIE}" `
-            -e VRC_AUTO_BUILD_TWO_FACTOR_AUTH_COOKIE="${VRC_AUTO_BUILD_TWO_FACTOR_AUTH_COOKIE}" `
-            "${{ env.unity-docker-image-windows }}" `
-            Unity.exe -projectPath C:\Project `
-            -username "${{ secrets.UNITY_EMAIL }}" `
-            -password "${{ secrets.UNITY_PASSWORD }}" `
-            -serial "${{ env.UNITY_SERIAL }}" `
-            -batchmode -logFile - `
-            -buildTarget Win64 `
+          ${{ steps.unity-setup.outputs.unity-path }} \
+            -projectPath "${{ env.workspace-path }}" \
+            -username "${{ secrets.UNITY_EMAIL }}" \
+            -password "${{ secrets.UNITY_PASSWORD }}" \
+            -serial "${{ env.UNITY_SERIAL }}" \
+            -batchmode -logFile - \
+            -buildTarget Win64 \
             -executeMethod VRChatAerospaceUniversity.VRChatAutoBuild.Worlds.AutoBuildVRChatWorld.BuildAndUploadWorld
         env:
-          # VRC_AUTO_BUILD_SCENE_PATH: ${{ env.WORKSPACE_SCENE_PATH }}
-          # VRC_AUTO_BUILD_CONTENT_ID: "wrld_67ed4bef-8dba-4e87-89e0-129030e65be7"
           VRC_AUTO_BUILD_CONTENT_ID: ${{ secrets.NIGHTLY_WORLD_CONTENT_ID }}
           VRC_AUTO_BUILD_SCENE_PATH: Assets\Scenes\VRCDefaultWorldScene.unity
           VRC_AUTO_BUILD_USERNAME: ${{ secrets.VRC_AUTO_BUILD_USERNAME }}