Skip to content

Commit 0260b4b

Browse files
committed
Merge branch 'develop' into sam/feature/interpolation-for-network-transform
* develop: fix: add `link.xml` to prevent IL2CPP stripping `Unity.PerformanceTesting` (#1172) chore: add boilerplate for `ClientNetworkTransform` sample (#1168) chore: remove `ClientNetworkVariable` (#1167) chore: Disable test while we reevaluate the assumption that INetworkM… (#1163) docs: rename Manual.md to Index.md Only track one metric for scene sync and do not report scene name (#1159) test: create job definitions for mobile build and test (#1152) test: make test runner scene ignored by default for BaseMultiInstanceTest (#1154) fix: remove left-over reference to SyncTransform (#1155) chore: remove unused SyncTransform.cs (#1153) chore!: remove NetworkNavMeshAgent (#1150) fix: NetworkObject parenting support in scene transitioning (#1148) chore!: rename Prototyping asmdef to Components (#1145) feat: add bootstrap sample to package (#1140) chore: remove `--yamato` param from `standards.py` (#1144) fix: MTT-504 connection approval messages and comparing networkconfig (#1138) refactor!: remove NetworkChannel and MultiplexTransportAdapter (#1133) # Conflicts: # com.unity.netcode.gameobjects/Components/Interpolator.meta # com.unity.netcode.gameobjects/Components/Interpolator/BufferedLinearInterpolator.cs # com.unity.netcode.gameobjects/Components/Interpolator/BufferedLinearInterpolator.cs.meta # testproject/Assets/Prefabs/PlayerCube.prefab
2 parents 81fb86d + 6a032b1 commit 0260b4b

File tree

102 files changed

+1825
-1707
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+1825
-1707
lines changed

.yamato/code-coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ code_coverage_win_{{ project.name }}:
1111
- pip install unity-downloader-cli --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
1212
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
1313
- unity-downloader-cli -u trunk -c editor --wait --fast
14-
- upm-ci package test -u .Editor --package-path com.unity.netcode.gameobjects --enable-code-coverage --code-coverage-options 'enableCyclomaticComplexity;generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.Netcode.Editor,+Unity.Netcode.Runtime,+Unity.Netcode.Prototyping'
14+
- upm-ci package test -u .Editor --package-path com.unity.netcode.gameobjects --enable-code-coverage --code-coverage-options 'enableCyclomaticComplexity;generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.Netcode.Editor,+Unity.Netcode.Runtime,+Unity.Netcode.Components'
1515
artifacts:
1616
logs:
1717
paths:

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

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
2021.2_Build_Android_player:
2+
name: 2021.2 Build Android player
3+
agent:
4+
type: Unity::VM
5+
image: package-ci/win10:stable
6+
flavor: b1.large
7+
commands:
8+
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
9+
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
10+
- |
11+
mkdir C:\TMP
12+
cd C:\TMP
13+
unity-downloader-cli -u 2021.2 -c editor -c Android -w --fast
14+
- |
15+
set UTR_VERSION=0.12.0
16+
utr.bat --suite=playmode --platform=Android --editor-location=C:\TMP\.Editor --testproject=testproject --player-save-path=build/players --artifacts_path=build/logs --scripting-backend=il2cpp --build-only --testfilter=Unity.Netcode.RuntimeTests --extra-editor-arg=-nographics --timeout=1800 --extra-editor-arg=-batchmode --reruncount=2
17+
artifacts:
18+
players:
19+
paths:
20+
- "build/players/**"
21+
logs:
22+
paths:
23+
- "build/logs/**"
24+
25+
2021.2_Build_iOS_player:
26+
name: 2021.2 Build iOS player
27+
agent:
28+
type: Unity::VM::osx
29+
image: mobile/macos-10.15-testing:stable
30+
flavor: b1.large
31+
commands:
32+
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
33+
- unity-downloader-cli -u 2021.2 -c editor -c iOS -w --fast
34+
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
35+
- chmod +x ./utr
36+
- export UTR_VERSION=0.12.0
37+
- ./utr --suite=playmode --platform=iOS --editor-location=.Editor --testproject=testproject --player-save-path=build/players --artifacts_path=build/logs --build-only --testfilter=Unity.Netcode.RuntimeTests
38+
artifacts:
39+
players:
40+
paths:
41+
- "build/players/**"
42+
logs:
43+
paths:
44+
- "build/logs/**"
45+
46+
47+
2021.2_Run_iOS_Player_With_Tests:
48+
name: 2021.2 Run iOS player with tests
49+
agent:
50+
type: Unity::mobile::iPhone
51+
model: SE
52+
image: mobile/macos-10.15-testing:stable
53+
flavor: b1.medium
54+
# Set a dependency on the build job
55+
dependencies:
56+
- .yamato/mobile-build-and-test.yml#2021.2_Build_iOS_player
57+
commands:
58+
# Download standalone UnityTestRunner
59+
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
60+
# Give UTR execution permissions
61+
- chmod +x ./utr
62+
# Run the test build on the device
63+
- export UTR_VERSION=0.12.0
64+
- ./utr --suite=playmode --platform=iOS --player-load-path=build/players --artifacts_path=build/test-results --testfilter=Unity.Netcode.RuntimeTests
65+
artifacts:
66+
logs:
67+
paths:
68+
- "build/test-results/**"
69+
70+
2021.2_Run_Android_Player_With_Tests:
71+
name: 2021.2 Run Android player with tests
72+
agent:
73+
type: Unity::mobile::shield
74+
image: mobile/android-execution-r19:stable
75+
flavor: b1.medium
76+
# Skip repository cloning
77+
skip_checkout: true
78+
# Set a dependency on the build job
79+
dependencies:
80+
- .yamato/mobile-build-and-test.yml#2021.2_Build_Android_player
81+
commands:
82+
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
83+
- |
84+
set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
85+
start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
86+
start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices
87+
set UTR_VERSION=0.12.0
88+
./utr --suite=playmode --platform=android --player-load-path=build/players --artifacts_path=build/test-results --testfilter=Unity.Netcode.RuntimeTests
89+
# Set uploadable artifact paths
90+
artifacts:
91+
logs:
92+
paths:
93+
- "build/test-results/**"

.yamato/project-standards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ standards_{{ projects.first.name }}:
1313
- pip install unity-downloader-cli --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
1414
- unity-downloader-cli -u {{ projects.first.test_editors.first }} -c editor --wait --fast
1515
- .Editor/Unity -batchmode -nographics -logFile - -executeMethod Packages.Rider.Editor.RiderScriptEditor.SyncSolution -projectPath {{ projects.first.path }} -quit
16-
- ./standards.py --tool-path $HOME/.dotnet/tools/dotnet-format --project-path {{ projects.first.path }} --yamato
16+
- ./standards.py --tool-path $HOME/.dotnet/tools/dotnet-format --project-path {{ projects.first.path }} --check

0 commit comments

Comments
 (0)