Skip to content

Commit a63a6db

Browse files
authored
Merge branch 'develop' into fix/nbu-heap-alloc
2 parents bacf86b + caac92d commit a63a6db

File tree

18 files changed

+879
-138
lines changed

18 files changed

+879
-138
lines changed

.yamato/_run-all.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ run_quick_checks:
1717
dependencies:
1818
- .yamato/package-pack.yml#package_pack_-_ngo_ubuntu
1919
- .yamato/project-standards.yml#standards_ubuntu_testproject_trunk
20+
# Run API validation to early-detect all new APIs that would force us to release new minor version of the package. Note that for this to work the package version in package.json must correspond to "actual package state" which means that it should be higher than last released version
21+
- .yamato/vetting-test.yml#vetting_test
2022

2123
# Runs all package tests
2224
run_all_package_tests:

.yamato/_triggers.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ develop_nightly:
108108
# Build player for webgl platform on trunk and 2021 editors
109109
- .yamato/project-updated-dependencies-test.yml#updated-dependencies_testproject_NGO_ubuntu_trunk
110110
- .yamato/project-updated-dependencies-test.yml#updated-dependencies_testproject_NGO_win_2021.3
111+
# Run API validation to early-detect all new APIs that would force us to release new minor version of the package. Note that for this to work the package version in package.json must correspond to "actual package state" which means that it should be higher than last released version
112+
- .yamato/vetting-test.yml#vetting_test
111113

112114

113115
# Run all tests on weekly bases

.yamato/package-pack.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ package_pack_-_ngo_{{ platform.name }}:
3737
variables:
3838
XRAY_PROFILE: "supported ./pvpExceptions.json"
3939
commands:
40+
- python Tools/scripts/release.py # Needed to ensure that CHANGELOG is properly formatted for this test due to the fact that we have bumped package version (to properly perform vetting tests)
4041
- upm-pvp pack "com.unity.netcode.gameobjects" --output upm-ci~/packages
4142
- upm-pvp xray --packages "upm-ci~/packages/com.unity.netcode.gameobjects*.tgz" --results pvp-results
4243
- upm-pvp require {% if platform.name == "win" %}"%XRAY_PROFILE%"{% else %}"$XRAY_PROFILE"{% endif %} --results pvp-results --allow-missing

.yamato/project.metafile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,9 @@ validation_editors:
161161
- 6000.1
162162
- 6000.2
163163
- trunk
164-
165-
164+
minimal:
165+
- 2021.3
166+
166167
# Scripting backends used by Standalone RunTimeTests---------------------------------------------------
167168

168169
scripting_backends:

.yamato/vetting-test.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{% metadata_file .yamato/project.metafile %} # All configuration that is used to create different configurations (used in for loops) is taken from this file.
2+
---
3+
# DESCRIPTION--------------------------------------------------------------------------
4+
# This configuration defines vetting tests for the Tools package which allows to validate if the package is in releasable state. This is important in particular because of API validation that allows to detect if we are introducing any new APIs that will force us to bump package version to new minor
5+
# If this test fails with new API error we should either make those API internal OR bump package version to new minor (note that the package version reflects the current package state)
6+
7+
# Note that we are packing the package only (no project context) so if package have any soft dependencies then project should be used to test it (to enable those APIs)
8+
{% for editor in validation_editors.minimal -%}
9+
vetting_test:
10+
name: MP Tools - Vetting Test (Win, {{editor}} LTS)
11+
agent: { type: Unity::VM, flavor: b1.large, image: package-ci/win11:v4 }
12+
commands:
13+
- python Tools/scripts/release.py # Needed to ensure that CHANGELOG is properly formatted for this test
14+
- npm install -g "upm-ci-utils@stable" --registry https://artifactory.prd.it.unity3d.com/artifactory/api/npm/upm-npm
15+
- unity-downloader-cli --fast --wait --unity-version {{ editor }} --components editor --arch x64
16+
- upm-ci package pack --package-path com.unity.netcode.gameobjects
17+
- upm-ci package test -u .Editor --package-path com.unity.netcode.gameobjects --type vetting-tests
18+
artifacts:
19+
logs:
20+
paths:
21+
- pvp-results/*
22+
- test-results/**
23+
- upm-ci~/test-results/**
24+
- upm-ci~/upm-ci.log
25+
{% endfor -%}

.yamato/wrench/recipe-regeneration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ test_-_wrench_jobs_up_to_date:
99
type: Unity::VM
1010
flavor: b1.large
1111
commands:
12-
- command: dotnet run --project Tools\CI\NGO.Cookbook.csproj
12+
- command: dotnet run --project Tools/CI/NGO.Cookbook.csproj
1313
- command: |-
1414
if [ -n "$(git status --porcelain -- .yamato/wrench)" ]; then
1515
git status
1616
echo "Your repo is not clean - diff output:"
1717
git diff
1818
echo "You must run recipe generation after updating recipes to update the generated YAML!"
19-
echo "Run 'dotnet run --project Tools\CI\NGO.Cookbook.csproj' from the root of your repository to regenerate all job definitions created by wrench."
19+
echo "Run 'dotnet run --project Tools/CI/NGO.Cookbook.csproj' from the root of your repository to regenerate all job definitions created by wrench."
2020
exit 1
2121
fi
2222
variables:

0 commit comments

Comments
 (0)