Skip to content

Commit e5c6481

Browse files
NoelStephensUnityNoelStephensUnity
committed
Merge branch 'develop-2.0.0' into chore/optimize-network-transform-state
2 parents cc5d84b + 4fdfb63 commit e5c6481

34 files changed

+668
-146
lines changed

‎.yamato/ngo-publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ngo_release_preparation:
44
triggers:
55
recurring:
66
- branch: develop-2.0.0 # We make new releases from this branch
7-
frequency: "10 * * 1" # Runs every Sunday at 10:00 AM
7+
frequency: "10 ? * 1" # Runs every Sunday at 10:00 AM
88
rerun: always
99
commands:
1010
- pip install PyGithub

‎.yamato/project-builders/builder.metafile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,21 @@
22

33
NetcodeProjects:
44
# Note that we are using internal Unity repo. This means that we may test with newest changes that are not yet released to our users (there are also public versions)
5+
# The parameters specify repo location, default branch to use (since you can modify it via job variable), path to manifest.json file so we can replace package entry and path to the project root folder since it differs between projects
56
# Note that for BossRoom 'main' branch supports NGOv1.X and 'develop' branch supports NGOv2.X
67
# TODO: For BossRoom correct branch to develop when PR-3736 is merged in their repo
78
BossRoom:
89
GithubRepo: "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git"
9-
branch: ngo-playtest-update
10+
defaultBranch: ngo-playtest-update
1011
manifestPath: Packages/manifest.json
1112
projectPath: '.'
1213
Asteroids:
1314
GithubRepo: "https://github.cds.internal.unity3d.com/unity/Asteroids-CMB-NGO-Sample.git"
14-
branch: main
15+
defaultBranch: main
1516
manifestPath: Packages/manifest.json
1617
projectPath: '.'
1718
SocialHub:
1819
GithubRepo: "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.bitesize.git"
19-
branch: main
20+
defaultBranch: main
2021
manifestPath: Basic/DistributedAuthoritySocialHub/Packages/manifest.json
2122
projectPath: 'Basic/DistributedAuthoritySocialHub'

‎.yamato/project-builders/project-builders.yml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,14 @@ build_{{ netcodeProject[0] }}_project:
3030
SCRIPTING_BACKEND_IL2CPP_MONO: il2cpp
3131
BURST_ON_OFF: on
3232
PLATFORM_WIN64_MAC_ANDROID: win64
33+
SAMPLE_BRANCH: {{ netcodeProject[1].defaultBranch }}
3334
commands:
3435
# Validate inputs passed via Yamato variables
3536
- python Tools/scripts/BuildAutomation/validate_params.py
36-
- echo Building {{ netcodeProject[0] }} project with Unity version of %UNITY_VERSION%, Scripting backend %SCRIPTING_BACKEND_IL2CPP_MONO%, Burst %BURST_ON_OFF% for platform %PLATFORM_WIN64_MAC_ANDROID%
37+
- echo Building {{ netcodeProject[0] }} project from branch {{ netcodeProject[1].defaultBranch }} with Unity version of %UNITY_VERSION%, Scripting backend %SCRIPTING_BACKEND_IL2CPP_MONO%, Burst %BURST_ON_OFF% for platform %PLATFORM_WIN64_MAC_ANDROID%
3738

3839
# Clone the external project repository into a specific directory. Notice that branch is also specified.
39-
- git clone --single-branch --branch {{ netcodeProject[1].branch }} {{ netcodeProject[1].GithubRepo }} C:/ClonedProject
40+
- git clone --single-branch --branch %SAMPLE_BRANCH% {{ netcodeProject[1].GithubRepo }} C:/ClonedProject
4041

4142
# Modify the external project's manifest to use the local N4E package from current branch on which this Yamato job is running. (requires python that should be preinstalled in the image)
4243
- python Tools/scripts/BuildAutomation/manifest_update.py --manifest-path C:/ClonedProject/{{ netcodeProject[1].manifestPath }} --local-package-path %YAMATO_SOURCE_DIR%/com.unity.netcode.gameobjects
@@ -61,21 +62,21 @@ build_{{ netcodeProject[0] }}_project:
6162
# Build the project using Unity Editor. This will call the given static BuilderScripts method.
6263
# Ideally, it would be nice to parametrize the BuilderScripts (for example to pass scripting backend as parameter) but -executeMethod only calls static methods without parameters so for now we will have multiple configurations
6364
# Notice that for Android platform even if mono is selected, il2cpp will be used since mono is not supported for Android builds.
64-
- IF "%PLATFORM_WIN64_MAC_ANDROID%"=="win64" (
65-
IF "%SCRIPTING_BACKEND_IL2CPP_MONO%"=="il2cpp" (
65+
- IF /I "%PLATFORM_WIN64_MAC_ANDROID%"=="win64" (
66+
IF /I "%SCRIPTING_BACKEND_IL2CPP_MONO%"=="il2cpp" (
6667
C:/TestingEditor/Unity.exe -projectPath C:/ClonedProject/{{ netcodeProject[1].projectPath }} -buildTarget win64 -executeMethod BuilderScripts.BuildWinIl2cpp -batchmode -logFile ./artifacts/UnityLog.txt -automated -crash-report-folder ./artifacts/CrashArtifacts -quit
6768
) ELSE (
6869
C:/TestingEditor/Unity.exe -projectPath C:/ClonedProject/{{ netcodeProject[1].projectPath }} -buildTarget win64 -executeMethod BuilderScripts.BuildWinMono -batchmode -logFile ./artifacts/UnityLog.txt -automated -crash-report-folder ./artifacts/CrashArtifacts -quit
6970
)
7071
)
71-
ELSE IF "%PLATFORM_WIN64_MAC_ANDROID%"=="mac" (
72-
IF "%SCRIPTING_BACKEND_IL2CPP_MONO%"=="il2cpp" (
72+
ELSE IF /I "%PLATFORM_WIN64_MAC_ANDROID%"=="mac" (
73+
IF /I "%SCRIPTING_BACKEND_IL2CPP_MONO%"=="il2cpp" (
7374
C:/TestingEditor/Unity.exe -projectPath C:/ClonedProject/{{ netcodeProject[1].projectPath }} -buildTarget osx -executeMethod BuilderScripts.BuildMacIl2cpp -batchmode -logFile ./artifacts/UnityLog.txt -automated -crash-report-folder ./artifacts/CrashArtifacts -quit
7475
) ELSE (
7576
C:/TestingEditor/Unity.exe -projectPath C:/ClonedProject/{{ netcodeProject[1].projectPath }} -buildTarget osx -executeMethod BuilderScripts.BuildMacMono -batchmode -logFile ./artifacts/UnityLog.txt -automated -crash-report-folder ./artifacts/CrashArtifacts -quit
7677
)
7778
)
78-
ELSE IF "%PLATFORM_WIN64_MAC_ANDROID%"=="android" (
79+
ELSE IF /I "%PLATFORM_WIN64_MAC_ANDROID%"=="android" (
7980
C:/TestingEditor/Unity.exe -projectPath C:/ClonedProject/{{ netcodeProject[1].projectPath }} -buildTarget android -executeMethod BuilderScripts.BuildAndroidIl2cpp -batchmode -logFile ./artifacts/UnityLog.txt -automated -crash-report-folder ./artifacts/CrashArtifacts -quit
8081
)
8182

‎.yamato/wrench/preview-a-p-v.yml‎

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -839,3 +839,166 @@ preview_apv_-_6000_5_-_windows:
839839
Job Maintainers: '#rm-packageworks'
840840
Wrench: 1.3.0.0
841841

842+
# Functional tests for dependents found in the latest 6000.5 manifest (MacOS).
843+
preview_apv_-_6000_5_-_macos:
844+
name: Preview APV - 6000.5 - macos
845+
agent:
846+
image: package-ci/macos-13:default
847+
type: Unity::VM::osx
848+
flavor: b1.xlarge
849+
commands:
850+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
851+
- command: 7z x -aoa wrench-localapv.zip
852+
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
853+
- command: python PythonScripts/print_machine_info.py
854+
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
855+
timeout: 20
856+
retries: 10
857+
- command: unity-downloader-cli -u trunk -c editor --path .Editor --fast
858+
timeout: 10
859+
retries: 3
860+
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.5 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
861+
- command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
862+
after:
863+
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
864+
artifacts:
865+
Crash Dumps:
866+
paths:
867+
- CrashDumps/**
868+
logs:
869+
paths:
870+
- '*.log'
871+
- '*.xml'
872+
- upm-ci~/test-results/**/*
873+
- upm-ci~/temp/*/Logs/**
874+
- upm-ci~/temp/*/Library/*.log
875+
- upm-ci~/temp/*/*.log
876+
- upm-ci~/temp/Builds/*.log
877+
packages:
878+
paths:
879+
- upm-ci~/packages/**/*
880+
PreviewAPVResults:
881+
paths:
882+
- PreviewApvArtifacts~/**
883+
- APVTest/**/manifest.json
884+
pvp-results:
885+
paths:
886+
- upm-ci~/pvp/**/*
887+
browsable: onDemand
888+
dependencies:
889+
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
890+
variables:
891+
UPMPVP_CONTEXT_WRENCH: 1.2.0.0
892+
metadata:
893+
Job Maintainers: '#rm-packageworks'
894+
Wrench: 1.2.0.0
895+
896+
# Functional tests for dependents found in the latest 6000.5 manifest (Ubuntu).
897+
preview_apv_-_6000_5_-_ubuntu:
898+
name: Preview APV - 6000.5 - ubuntu
899+
agent:
900+
image: package-ci/ubuntu-22.04:v4
901+
type: Unity::VM
902+
flavor: b1.large
903+
commands:
904+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
905+
- command: 7z x -aoa wrench-localapv.zip
906+
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
907+
- command: python PythonScripts/print_machine_info.py
908+
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
909+
timeout: 20
910+
retries: 10
911+
- command: unity-downloader-cli -u trunk -c editor --path .Editor --fast
912+
timeout: 10
913+
retries: 3
914+
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.5 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
915+
- command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
916+
after:
917+
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
918+
artifacts:
919+
Crash Dumps:
920+
paths:
921+
- CrashDumps/**
922+
logs:
923+
paths:
924+
- '*.log'
925+
- '*.xml'
926+
- upm-ci~/test-results/**/*
927+
- upm-ci~/temp/*/Logs/**
928+
- upm-ci~/temp/*/Library/*.log
929+
- upm-ci~/temp/*/*.log
930+
- upm-ci~/temp/Builds/*.log
931+
packages:
932+
paths:
933+
- upm-ci~/packages/**/*
934+
PreviewAPVResults:
935+
paths:
936+
- PreviewApvArtifacts~/**
937+
- APVTest/**/manifest.json
938+
pvp-results:
939+
paths:
940+
- upm-ci~/pvp/**/*
941+
browsable: onDemand
942+
dependencies:
943+
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
944+
variables:
945+
UPMPVP_CONTEXT_WRENCH: 1.2.0.0
946+
metadata:
947+
Job Maintainers: '#rm-packageworks'
948+
Wrench: 1.2.0.0
949+
950+
# Functional tests for dependents found in the latest 6000.5 manifest (Windows).
951+
preview_apv_-_6000_5_-_windows:
952+
name: Preview APV - 6000.5 - windows
953+
agent:
954+
image: package-ci/win10:default
955+
type: Unity::VM
956+
flavor: b1.large
957+
commands:
958+
- command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f
959+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
960+
- command: 7z x -aoa wrench-localapv.zip
961+
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
962+
- command: python PythonScripts/print_machine_info.py
963+
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
964+
timeout: 20
965+
retries: 10
966+
- command: unity-downloader-cli -u trunk -c editor --path .Editor --fast
967+
timeout: 10
968+
retries: 3
969+
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.5 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
970+
- command: python PythonScripts/editor_manifest_validator.py --version=6000.5 --wrench-config=.yamato/wrench/wrench_config.json
971+
after:
972+
- command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
973+
artifacts:
974+
Crash Dumps:
975+
paths:
976+
- CrashDumps/**
977+
logs:
978+
paths:
979+
- '*.log'
980+
- '*.xml'
981+
- upm-ci~/test-results/**/*
982+
- upm-ci~/temp/*/Logs/**
983+
- upm-ci~/temp/*/Library/*.log
984+
- upm-ci~/temp/*/*.log
985+
- upm-ci~/temp/Builds/*.log
986+
packages:
987+
paths:
988+
- upm-ci~/packages/**/*
989+
PreviewAPVResults:
990+
paths:
991+
- PreviewApvArtifacts~/**
992+
- APVTest/**/manifest.json
993+
pvp-results:
994+
paths:
995+
- upm-ci~/pvp/**/*
996+
browsable: onDemand
997+
dependencies:
998+
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
999+
variables:
1000+
UPMPVP_CONTEXT_WRENCH: 1.2.0.0
1001+
metadata:
1002+
Job Maintainers: '#rm-packageworks'
1003+
Wrench: 1.2.0.0
1004+

0 commit comments

Comments
 (0)