ci: unity 6 mac build

Author: nattb8

.gitattributes

@@ -3,5 +3,7 @@
 # Ensure symlinks are stored as symlinks, not as text files
 sample-unity6/Assets/Scenes text=auto
 sample-unity6/Assets/Scripts text=auto
+sample-unity6/Assets/Editor text=auto
 sample-unity6/Assets/Scenes.meta text=auto
 sample-unity6/Assets/Scripts.meta text=auto
+sample-unity6/Assets/Editor.meta text=auto

.github/workflows/ui-tests.yml

@@ -11,7 +11,8 @@ on:
         type: choice
         options:
           - All
-          - StandaloneOSX
+          - StandaloneOSX  # Builds Unity 2021 macOS only
+          - StandaloneOSX-Unity6  # Builds Unity 6 macOS only
           - StandaloneWindows64
           - Android
           - iOS
@@ -31,15 +32,28 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          # Unity 2021 macOS build
           - targetPlatform: StandaloneOSX
             buildMethod: MacBuilder.BuildForAltTester
             buildPath: sample/Builds/MacOS
+            projectPath: sample
+            unityVersion: 2021.3.26f1
+          # Unity 6 macOS build (also triggered when StandaloneOSX is selected)
+          - targetPlatform: StandaloneOSX-Unity6
+            buildMethod: MacBuilderUnity6.BuildForAltTester
+            buildPath: sample-unity6/Builds/MacOS
+            projectPath: sample-unity6
+            unityVersion: 6000.0.58f1
           - targetPlatform: StandaloneWindows64
             buildMethod: WindowsBuilder.BuildForAltTester
             buildPath: sample/Builds/Windows64
+            projectPath: sample
+            unityVersion: 2021.3.26f1
           - targetPlatform: Android
             buildMethod: MobileBuilder.BuildForAltTester
             buildPath: sample/Builds/Android
+            projectPath: sample
+            unityVersion: 2021.3.26f1
     steps:
       - uses: actions/checkout@v3
         if: github.event_name != 'workflow_dispatch' || github.event.inputs.targetPlatform == 'All' || github.event.inputs.targetPlatform == matrix.targetPlatform
@@ -49,7 +63,7 @@ jobs:
         if: github.event_name != 'workflow_dispatch' || github.event.inputs.targetPlatform == 'All' || github.event.inputs.targetPlatform == matrix.targetPlatform
         with:
           path: Library
-          key: Library-${{ matrix.targetPlatform }}-${{ hashFiles('sample/Assets/**', 'sample/Packages/**', 'sample/ProjectSettings/**') }}
+          key: Library-${{ matrix.targetPlatform }}-${{ hashFiles(format('{0}/Assets/**', matrix.projectPath), format('{0}/Packages/**', matrix.projectPath), format('{0}/ProjectSettings/**', matrix.projectPath)) }}
           restore-keys: |
             Library-${{ matrix.targetPlatform }}
             Library-
@@ -61,8 +75,9 @@ jobs:
           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
           UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
         with:
-          targetPlatform: ${{ matrix.targetPlatform }}
-          projectPath: sample
+          targetPlatform: ${{ contains(matrix.targetPlatform, 'Unity6') && 'StandaloneOSX' || matrix.targetPlatform }}
+          projectPath: ${{ matrix.projectPath }}
+          unityVersion: ${{ matrix.unityVersion }}
           buildMethod: ${{ matrix.buildMethod }}
           customParameters: -logFile logFile.log -quit -batchmode
           artifactsPath: ${{ matrix.buildPath }}
@@ -84,9 +99,18 @@ jobs:
           - targetPlatform: StandaloneOSX
             runs-on: [self-hosted, macOS]
             test_script: pytest -xs test/test_mac.py::MacTest
+            projectPath: sample
+            unityAppName: SampleApp
+          - targetPlatform: StandaloneOSX-Unity6
+            runs-on: [self-hosted, macOS]
+            test_script: pytest -xs test/test_mac.py::MacTest
+            projectPath: sample-unity6
+            unityAppName: Sample Unity 6 macOS
           - targetPlatform: StandaloneWindows64
             runs-on: [self-hosted, windows]
             test_script: python -m pytest -xs test/test_windows.py::WindowsTest
+            projectPath: sample
+            unityAppName: SampleApp
           # - targetPlatform: Android
           #   runs-on: [ self-hosted, macOS ]
           #   test_script: browserstack-sdk pytest -s ./test/test_android.py --browserstack.config "browserstack.android.yml"
@@ -100,7 +124,7 @@ jobs:
         with:
           lfs: true
       - name: Create temporary keychain
-        if: matrix.targetPlatform == 'StandaloneOSX' && (github.event_name != 'workflow_dispatch' || github.event.inputs.targetPlatform == 'All' || github.event.inputs.targetPlatform == 'StandaloneOSX')
+        if: contains(matrix.targetPlatform, 'StandaloneOSX') && (github.event_name != 'workflow_dispatch' || github.event.inputs.targetPlatform == 'All' || github.event.inputs.targetPlatform == matrix.targetPlatform)
         run: |
           security list-keychains
           security delete-keychain temporary || true
@@ -113,32 +137,32 @@ jobs:
         if: github.event_name != 'workflow_dispatch' || github.event.inputs.targetPlatform == 'All' || github.event.inputs.targetPlatform == matrix.targetPlatform
         with:
           name: Build-${{ matrix.targetPlatform }}
-          path: sample/Tests
+          path: ${{ matrix.projectPath }}/Tests
       - name: Make macOS artifact executable
-        if: matrix.targetPlatform == 'StandaloneOSX' && (github.event_name != 'workflow_dispatch' || github.event.inputs.targetPlatform == 'All' || github.event.inputs.targetPlatform == 'StandaloneOSX')
-        run: chmod +x sample/Tests/SampleApp.app/Contents/MacOS/*
+        if: contains(matrix.targetPlatform, 'StandaloneOSX') && (github.event_name != 'workflow_dispatch' || github.event.inputs.targetPlatform == 'All' || github.event.inputs.targetPlatform == matrix.targetPlatform)
+        run: chmod +x ${{ matrix.projectPath }}/Tests/${{ matrix.unityAppName }}.app/Contents/MacOS/*
       - uses: actions/setup-python@v4
         if: github.event_name != 'workflow_dispatch' || github.event.inputs.targetPlatform == 'All' || github.event.inputs.targetPlatform == matrix.targetPlatform
         with:
           python-version: "3.13"
       - name: Install dependencies (Windows)
         if: matrix.targetPlatform == 'StandaloneWindows64' && (github.event_name != 'workflow_dispatch' || github.event.inputs.targetPlatform == 'All' || github.event.inputs.targetPlatform == 'StandaloneWindows64')
-        run: pip install -r "sample/Tests/requirements-desktop.txt"
+        run: pip install -r "${{ matrix.projectPath }}/Tests/requirements-desktop.txt"
       - name: Install dependencies (Mac)
-        if: matrix.targetPlatform == 'StandaloneOSX' && (github.event_name != 'workflow_dispatch' || github.event.inputs.targetPlatform == 'All' || github.event.inputs.targetPlatform == 'StandaloneOSX')
-        run: pip install -r "sample/Tests/requirements-desktop.txt"
+        if: contains(matrix.targetPlatform, 'StandaloneOSX') && (github.event_name != 'workflow_dispatch' || github.event.inputs.targetPlatform == 'All' || github.event.inputs.targetPlatform == matrix.targetPlatform)
+        run: pip install -r "${{ matrix.projectPath }}/Tests/requirements-desktop.txt"
       - name: Run UI tests
         if: github.event_name != 'workflow_dispatch' || github.event.inputs.targetPlatform == 'All' || github.event.inputs.targetPlatform == matrix.targetPlatform
-        env:
-          UNITY_APP_PATH: SampleApp.app
-          UNITY_APP_NAME: SampleApp
+        env: 
+          UNITY_APP_PATH: ${{ matrix.unityAppName }}.app
+          UNITY_APP_NAME: ${{ matrix.unityAppName }}
           MAILSLURP_API_KEY: ${{ secrets.MAILSLURP_API_KEY }}
           BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
           BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
-        working-directory: sample/Tests
+        working-directory: ${{ matrix.projectPath }}/Tests
         run: ${{ matrix.test_script }}
       - name: Remove temporary keychain
-        if: matrix.targetPlatform == 'StandaloneOSX' && (github.event_name != 'workflow_dispatch' || github.event.inputs.targetPlatform == 'All' || github.event.inputs.targetPlatform == 'StandaloneOSX')
+        if: contains(matrix.targetPlatform, 'StandaloneOSX') && (github.event_name != 'workflow_dispatch' || github.event.inputs.targetPlatform == 'All' || github.event.inputs.targetPlatform == matrix.targetPlatform)
         run: |
           security list-keychains
           security delete-keychain temporary

README.md

@@ -24,17 +24,17 @@ This repository contains two sample projects:
 - **`sample/`** - Unity 2021.3.26f1 sample project
 - **`sample-unity6/`** - Unity 6 sample project *(work in progress)*
 
-Both projects share the same Scenes and Scripts via symbolic links, providing a single source of truth for the sample code. See [`sample-unity6/README.md`](sample-unity6/README.md) for setup instructions.
+Both projects share the same Scenes, Scripts, and Editor folders via symbolic links, providing a single source of truth for the sample code. See [`sample-unity6/README.md`](sample-unity6/README.md) for setup instructions.
 
 ### First Time Setup (for contributors)
 
-The `sample-unity6` project uses symbolic links to share Scenes and Scripts with the `sample` project.
+The `sample-unity6` project uses symbolic links to share Scenes, Scripts, and Editor folders with the `sample` project.
 
 **macOS/Linux:** Symlinks are created automatically when you clone/pull - no action needed.
 
 **Windows:** Check if symlinks were created correctly:
 1. Navigate to `sample-unity6/Assets/`
-2. Check if `Scenes` and `Scripts` are folders (symlinks work) or small text files (symlinks didn't work)
+2. Check if `Scenes`, `Scripts`, and `Editor` are folders (symlinks work) or small text files (symlinks didn't work)
 
 If symlinks didn't work, run the setup script:
 

sample-unity6/Assets/DefaultVolumeProfile.asset

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3}
+  m_Name: DefaultVolumeProfile
+  m_EditorClassIdentifier: 
+  components: []

sample-unity6/Assets/DefaultVolumeProfile.asset.meta

@@ -0,0 +1 @@
+../../sample/Assets/Editor

sample-unity6/Assets/Editor

@@ -0,0 +1 @@
+../../sample/Assets/Editor.meta

sample-unity6/Assets/Editor.meta

@@ -35,7 +35,7 @@ MonoBehaviour:
     - line: '|   useOnDemandResources: 0'
     - line: '|   accelerometerFrequency: 60'
     - line: '|   companyName: Immutable'
-    - line: '|   productName: Sample Unity 6 macOS'
+    - line: '|   productName: SampleApp'
     - line: '|   defaultCursor: {instanceID: 0}'
     - line: '|   cursorHotspot: {x: 0, y: 0}'
     - line: '|   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b:
@@ -793,7 +793,8 @@ MonoBehaviour:
     - line: '|   webGLWebAssemblyBigInt: 0'
     - line: '|   webGLCloseOnQuit: 0'
     - line: '|   webWasm2023: 0'
-    - line: '|   scriptingDefineSymbols: {}'
+    - line: '|   scriptingDefineSymbols:'
+    - line: '|     Standalone: VUPLEX_STANDALONE;VUPLEX_WEBVIEW'
     - line: '|   additionalCompilerArguments: {}'
     - line: '|   platformArchitecture: {}'
     - line: '|   scriptingBackend:'