Skip to content

Commit 678a944

Browse files
Merge branch 'main' into ci/slough-artifactory-part2
2 parents b4a03c0 + 7fa7770 commit 678a944

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# This should make it easy to add new rules without breaking existing ones.
1414

1515
# Global rule:
16-
* @Unity-Technologies/mtt-samples-eng
16+
* @Unity-Technologies/mtt-samples-dev

.yamato/mobile-build-and-run.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ Build_Player_With_Tests_iOS_{{ project.name }}_{{ editor }}:
1818
- curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
1919
- chmod +x ./utr
2020
- ./utr --suite=playmode --platform=iOS --editor-location=.Editor --testproject={{ project.path }} --player-save-path=build/players --artifacts_path=build/logs --build-only --testfilter=Unity.BossRoom.Tests.Runtime
21-
21+
variables:
22+
UNITY_HANDLEUIINTERRUPTIONS: 1
2223
artifacts:
2324
players:
2425
paths:
@@ -69,6 +70,7 @@ Build_Player_With_Tests_Android_{{ project.name }}_{{ editor }}:
6970
mobile_test_ios_{{ project.name }}_{{ editor }}:
7071
name: {{ project.name }} mobile project tests - {{ editor }} on iOS
7172
agent:
73+
model: SE-Gen3
7274
type: Unity::mobile::iPhone
7375
image: package-ci/macos-12:v4
7476
flavor: b1.medium

.yamato/project-standards.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ standards_{{ projects.first.name }}:
99
commands:
1010
- dotnet --version
1111
- dotnet format --version
12-
- pip install unity-downloader-cli --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
12+
- sudo add-apt-repository -y ppa:deadsnakes/ppa
13+
- sudo apt update
14+
- sudo apt install -y python3.9
15+
- python3 -m pip install unity-downloader-cli --upgrade
1316
- unity-downloader-cli -u {{ projects.first.test_editors.first }} -c editor --wait --fast
1417
- .Editor/Unity -batchmode -nographics -logFile - -executeMethod Packages.Rider.Editor.RiderScriptEditor.SyncSolution -projectPath {{ projects.first.path }} -quit
1518
- dotnet run --project dotnet-tools/netcode.standards -- --project={{ projects.first.path }} --check

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
66

77
Additional documentation and release notes are available at [Multiplayer Documentation](https://docs-multiplayer.unity3d.com).
88

9+
## [unreleased] yyyy-mm-dd
10+
11+
### Fixed
12+
* Internal standards job fix (#915)
13+
914
## [2.5.0] - 2024-04-18
1015

1116
### Changed

0 commit comments

Comments
 (0)