CI: Update to new version, fix permissions

This should also fix a bug in which the license activation repeatedly times out.
uni-bremen-agst · Dec 23, 2023 · ed4f0ba · ed4f0ba
1 parent c538137
commit ed4f0ba
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -145,16 +145,19 @@ jobs:
           restore-keys: |
             Library-SEE-Tests
             Library-SEE
-      - uses: game-ci/unity-test-runner@c80d9094f5f5f471d0ae6f44a8c8868a448bfb7e
+      - uses: game-ci/unity-test-runner@v4
         timeout-minutes: 45
         name: Run Tests
         id: tests
         env:
           UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
         with:
           githubToken: ${{ secrets.GITHUB_TOKEN }}
           checkName: Test Results
           testMode: EditMode  # PlayMode tests get stuck in batchmode
+          runAsHostUser: true
           customParameters: -testCategory "!NonDeterministic"
           coverageOptions: 'generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+SEE'
       - uses: actions/upload-artifact@v3
@@ -215,16 +218,19 @@ jobs:
           # Try deleting any previous build, but not other zip files that we may need later.
           git clean -fd -e 'build-*.zip'
           rm -rf build "build-${{ matrix.targetPlatform }}.zip" || true
-      - uses: game-ci/unity-builder@7afabe74da5227a9ecd537f5260b398258c3eb3b
+      - uses: game-ci/unity-builder@v4
         timeout-minutes: 45
         name: Build project
         id: build
         env:
           UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
         with:
           targetPlatform: ${{ matrix.targetPlatform }}
           buildName: ${{ matrix.targetPlatform }}
           buildMethod: CITools.BuildScript.Build
+          runAsHostUser: true
           allowDirtyBuild: true
       - name: Compress build
         # Compress only if manually triggered or merged into master, otherwise we won't upload.
@@ -288,8 +294,4 @@ jobs:
         if: always()
         shell: bash
         run: ./.github/scripts/stop-docker.sh
-      - name: Fix permissions
-        if: always()
-        shell: bash
-        run: sudo /mnt/scripts/set-work-permissions.sh
 
diff --git a/GitScripts/check_for_lfs_files.sh b/GitScripts/check_for_lfs_files.sh
@@ -25,7 +25,7 @@ if [ -n "$CI" ]; then
 	set -ex
 
 	# Check for non-SEE Assets.
-	CHANGED_ASSETS=$(git diff --name-only --diff-filter=AM origin/master -- Assets ':!Assets/Editor' ':!Assets/Native' ':!Assets/StreamingAssets' ':!Assets/NuGet.config*' ':!Assets/packages.config*' ':!Assets/Resources' ':!Assets/Scenes' ':!Assets/SEE*' ':!Assets/XR' | git check-attr --stdin filter | grep -v "filter: lfs" || exit 0)
+	CHANGED_ASSETS=$(git diff --name-only --diff-filter=AM origin/master -- Assets ':!Assets/Editor' ':!Assets/Native' ':!Assets/StreamingAssets' ':!Assets/csc.rsp*' ':!Assets/NuGet.config*' ':!Assets/packages.config*' ':!Assets/Resources' ':!Assets/Scenes' ':!Assets/SEE*' ':!Assets/XR' | git check-attr --stdin filter | grep -v "filter: lfs" || exit 0)
 	if [ -n "$CHANGED_ASSETS" ]; then
 		echo ""
 		echo -n "::error title=Assets not in LFS::You have committed non-SEE assets outside of LFS.%0A"