ci: load unity 6 profile after alttester setup, fix concurrency config, unity 6 deeplink, symbolic links for tests

Author: nattb8

.gitattributes

@@ -7,3 +7,4 @@ 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
+sample-unity6/Tests text=auto

.github/workflows/ui-tests.yml

@@ -59,6 +59,26 @@ jobs:
         if: github.event_name != 'workflow_dispatch' || github.event.inputs.targetPlatform == 'All' || github.event.inputs.targetPlatform == matrix.targetPlatform
         with:
           lfs: true
+      - name: Setup symlinks for Unity 6 project
+        if: contains(matrix.targetPlatform, 'Unity6') && (github.event_name != 'workflow_dispatch' || github.event.inputs.targetPlatform == 'All' || github.event.inputs.targetPlatform == matrix.targetPlatform)
+        run: |
+          echo "Setting up symlinks for sample-unity6..."
+          cd sample-unity6/Assets
+          rm -rf Scenes Scripts Editor
+          rm -f Scenes.meta Scripts.meta Editor.meta
+          ln -s ../../sample/Assets/Scenes Scenes
+          ln -s ../../sample/Assets/Scripts Scripts
+          ln -s ../../sample/Assets/Editor Editor
+          ln -s ../../sample/Assets/Scenes.meta Scenes.meta
+          ln -s ../../sample/Assets/Scripts.meta Scripts.meta
+          ln -s ../../sample/Assets/Editor.meta Editor.meta
+          echo "✅ Symlinks for Assets created successfully!"
+          ls -la Scenes Scripts Editor
+          cd ..
+          rm -rf Tests
+          ln -s ../sample/Tests Tests
+          echo "✅ Symlink for Tests created successfully!"
+          ls -la Tests
       - uses: actions/cache@v3
         if: github.event_name != 'workflow_dispatch' || github.event.inputs.targetPlatform == 'All' || github.event.inputs.targetPlatform == matrix.targetPlatform
         with:
@@ -101,21 +121,24 @@ jobs:
             test_script: pytest -xs test/test_mac.py::MacTest
             projectPath: sample
             unityAppName: SampleApp
+            concurrency_group: macos
           - 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
+            concurrency_group: macos
           - targetPlatform: StandaloneWindows64
             runs-on: [self-hosted, windows]
             test_script: python -m pytest -xs test/test_windows.py::WindowsTest
             projectPath: sample
             unityAppName: SampleApp
+            concurrency_group: windows
           # - targetPlatform: Android
           #   runs-on: [ self-hosted, macOS ]
           #   test_script: browserstack-sdk pytest -s ./test/test_android.py --browserstack.config "browserstack.android.yml"
     concurrency:
-      group: ui-tests-email-inbox
+      group: ui-tests-email-inbox-${{ matrix.concurrency_group }}
       cancel-in-progress: false  # Let tests complete rather than canceling
     runs-on: ${{ matrix.runs-on }}
     steps:
@@ -140,7 +163,7 @@ jobs:
           path: ${{ matrix.projectPath }}/Tests
       - name: Make macOS artifact executable
         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/*
+        run: chmod -R +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:

.gitignore

@@ -111,4 +111,7 @@ __pycache__/
 *.pyc
 .pytest_cache/
 
-xcuserdata/
+xcuserdata/
+
+logFile.log
+logFile-improved.log

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, 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.
+Both projects share the same Scenes, Scripts, Editor folders, and Tests 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, Scripts, and Editor folders with the `sample` project.
+The `sample-unity6` project uses symbolic links to share Scenes, Scripts, Editor folders, and Tests 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`, `Scripts`, and `Editor` are folders (symlinks work) or small text files (symlinks didn't work)
+1. Navigate to `sample-unity6/Assets/` and `sample-unity6/`
+2. Check if `Scenes`, `Scripts`, `Editor`, and `Tests` are folders (symlinks work) or small text files (symlinks didn't work)
 
 If symlinks didn't work, run the setup script:
 

sample-unity6/Assets/Resources/AltTester.meta

@@ -0,0 +1 @@
+[{"name":"Horizontal","negativeButton":"left","positiveButton":"right","altPositiveButton":"d","altNegativeButton":"a","type":0,"axisDirection":0},{"name":"Vertical","negativeButton":"down","positiveButton":"up","altPositiveButton":"w","altNegativeButton":"s","type":0,"axisDirection":0},{"name":"Fire1","negativeButton":"","positiveButton":"left ctrl","altPositiveButton":"mouse 0","altNegativeButton":"","type":0,"axisDirection":0},{"name":"Fire2","negativeButton":"","positiveButton":"left alt","altPositiveButton":"mouse 1","altNegativeButton":"","type":0,"axisDirection":0},{"name":"Fire3","negativeButton":"","positiveButton":"left shift","altPositiveButton":"mouse 2","altNegativeButton":"","type":0,"axisDirection":0},{"name":"Jump","negativeButton":"","positiveButton":"space","altPositiveButton":"","altNegativeButton":"","type":0,"axisDirection":0},{"name":"Mouse X","negativeButton":"","positiveButton":"","altPositiveButton":"","altNegativeButton":"","type":1,"axisDirection":0},{"name":"Mouse Y","negativeButton":"","positiveButton":"","altPositiveButton":"","altNegativeButton":"","type":1,"axisDirection":1},{"name":"Mouse ScrollWheel","negativeButton":"","positiveButton":"","altPositiveButton":"","altNegativeButton":"","type":1,"axisDirection":2},{"name":"Horizontal","negativeButton":"","positiveButton":"","altPositiveButton":"","altNegativeButton":"","type":2,"axisDirection":0},{"name":"Vertical","negativeButton":"","positiveButton":"","altPositiveButton":"","altNegativeButton":"","type":2,"axisDirection":1},{"name":"Fire1","negativeButton":"","positiveButton":"joystick button 0","altPositiveButton":"","altNegativeButton":"","type":0,"axisDirection":0},{"name":"Fire2","negativeButton":"","positiveButton":"joystick button 1","altPositiveButton":"","altNegativeButton":"","type":0,"axisDirection":0},{"name":"Fire3","negativeButton":"","positiveButton":"joystick button 2","altPositiveButton":"","altNegativeButton":"","type":0,"axisDirection":0},{"name":"Jump","negativeButton":"","positiveButton":"joystick button 3","altPositiveButton":"","altNegativeButton":"","type":0,"axisDirection":0},{"name":"Submit","negativeButton":"","positiveButton":"return","altPositiveButton":"joystick button 0","altNegativeButton":"","type":0,"axisDirection":0},{"name":"Submit","negativeButton":"","positiveButton":"enter","altPositiveButton":"space","altNegativeButton":"","type":0,"axisDirection":0},{"name":"Cancel","negativeButton":"","positiveButton":"escape","altPositiveButton":"joystick button 1","altNegativeButton":"","type":0,"axisDirection":0},{"name":"Enable Debug Button 1","negativeButton":"","positiveButton":"left ctrl","altPositiveButton":"joystick button 8","altNegativeButton":"","type":0,"axisDirection":0},{"name":"Enable Debug Button 2","negativeButton":"","positiveButton":"backspace","altPositiveButton":"joystick button 9","altNegativeButton":"","type":0,"axisDirection":0},{"name":"Debug Reset","negativeButton":"","positiveButton":"left alt","altPositiveButton":"joystick button 1","altNegativeButton":"","type":0,"axisDirection":0},{"name":"Debug Next","negativeButton":"","positiveButton":"page down","altPositiveButton":"joystick button 5","altNegativeButton":"","type":0,"axisDirection":0},{"name":"Debug Previous","negativeButton":"","positiveButton":"page up","altPositiveButton":"joystick button 4","altNegativeButton":"","type":0,"axisDirection":0},{"name":"Debug Validate","negativeButton":"","positiveButton":"return","altPositiveButton":"joystick button 0","altNegativeButton":"","type":0,"axisDirection":0},{"name":"Debug Persistent","negativeButton":"","positiveButton":"right shift","altPositiveButton":"joystick button 2","altNegativeButton":"","type":0,"axisDirection":0},{"name":"Debug Multiplier","negativeButton":"","positiveButton":"left shift","altPositiveButton":"joystick button 3","altNegativeButton":"","type":0,"axisDirection":0},{"name":"Debug Horizontal","negativeButton":"left","positiveButton":"right","altPositiveButton":"","altNegativeButton":"","type":0,"axisDirection":0},{"name":"Debug Vertical","negativeButton":"down","positiveButton":"up","altPositiveButton":"","altNegativeButton":"","type":0,"axisDirection":0},{"name":"Debug Vertical","negativeButton":"down","positiveButton":"up","altPositiveButton":"","altNegativeButton":"","type":2,"axisDirection":6},{"name":"Debug Horizontal","negativeButton":"left","positiveButton":"right","altPositiveButton":"","altNegativeButton":"","type":2,"axisDirection":5}]

sample-unity6/Assets/Resources/AltTester/AltTesterInputAxisData.json

@@ -0,0 +1,49 @@
+%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: 2705215ac5b84b70bacc50632be6e391, type: 3}
+  m_Name: TMP Settings
+  m_EditorClassIdentifier: 
+  assetVersion: 
+  m_TextWrappingMode: 0
+  m_enableKerning: 0
+  m_ActiveFontFeatures: 00000000
+  m_enableExtraPadding: 0
+  m_enableTintAllSprites: 0
+  m_enableParseEscapeCharacters: 0
+  m_EnableRaycastTarget: 1
+  m_GetFontFeaturesAtRuntime: 1
+  m_missingGlyphCharacter: 0
+  m_ClearDynamicDataOnBuild: 1
+  m_warningsDisabled: 0
+  m_defaultFontAsset: {fileID: 0}
+  m_defaultFontAssetPath: 
+  m_defaultFontSize: 0
+  m_defaultAutoSizeMinRatio: 0
+  m_defaultAutoSizeMaxRatio: 0
+  m_defaultTextMeshProTextContainerSize: {x: 0, y: 0}
+  m_defaultTextMeshProUITextContainerSize: {x: 0, y: 0}
+  m_autoSizeTextContainer: 0
+  m_IsTextObjectScaleStatic: 0
+  m_fallbackFontAssets: []
+  m_matchMaterialPreset: 0
+  m_HideSubTextObjects: 1
+  m_defaultSpriteAsset: {fileID: 0}
+  m_defaultSpriteAssetPath: 
+  m_enableEmojiSupport: 0
+  m_MissingCharacterSpriteUnicode: 0
+  m_EmojiFallbackTextAssets: []
+  m_defaultColorGradientPresetsPath: 
+  m_defaultStyleSheet: {fileID: 0}
+  m_StyleSheetsResourcePath: 
+  m_leadingCharacters: {fileID: 0}
+  m_followingCharacters: {fileID: 0}
+  m_UseModernHangulLineBreakingRules: 0

sample-unity6/Assets/Resources/AltTester/AltTesterInputAxisData.json.meta

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