Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
ci: load unity 6 profile after alttester setup, unity 6 deeplink, sym…
…bolic links for tests
  • Loading branch information
nattb8 committed Oct 6, 2025
commit da09f711d4879fcd7dcca2829159db57c65b5c98
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -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
27 changes: 25 additions & 2 deletions .github/workflows/ui-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -111,4 +111,7 @@ __pycache__/
*.pyc
.pytest_cache/

xcuserdata/
xcuserdata/

logFile.log
logFile-improved.log
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
8 changes: 8 additions & 0 deletions sample-unity6/Assets/Resources/AltTester.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -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}]

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

49 changes: 49 additions & 0 deletions sample-unity6/Assets/Resources/TMP Settings.asset
Original file line number Diff line number Diff line change
@@ -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
8 changes: 8 additions & 0 deletions sample-unity6/Assets/Resources/TMP Settings.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:'
Expand Down
8 changes: 8 additions & 0 deletions sample-unity6/Assets/TextMesh Pro.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions sample-unity6/Assets/TextMesh Pro/Fonts.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 46 additions & 0 deletions sample-unity6/Assets/TextMesh Pro/Fonts/LiberationSans - OFL.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
Digitized data copyright (c) 2010 Google Corporation
with Reserved Font Arimo, Tinos and Cousine.
Copyright (c) 2012 Red Hat, Inc.
with Reserved Font Name Liberation.

This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL

-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------

PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others.

The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives.

DEFINITIONS
"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation.

"Reserved Font Name" refers to any names specified as such after the copyright statement(s).

"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s).

"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment.

"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software.

PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions:

1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself.

2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.

3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users.

4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission.

5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software.

TERMINATION
This license becomes null and void if any of the above conditions are not met.

DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
19 changes: 19 additions & 0 deletions sample-unity6/Assets/TextMesh Pro/Fonts/LiberationSans.ttf.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions sample-unity6/Assets/TextMesh Pro/Resources.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading