Skip to content

Commit 13e427b

Browse files
ShadauxCatShadauxCat
authored
Merge branch 'experimental/v3-x-x/unified-poc-migration' into experimental/v3-x-x/hybrid_spawn_integration_tests
2 parents f52b59e + 9bd899c commit 13e427b

231 files changed

Lines changed: 3233 additions & 15627 deletions

File tree

Some content is hidden

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

‎.github/workflows/conventional-pr.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
branches:
77
- develop
88
- develop-2.0.0
9+
- develop-3.x.x
910
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1011
jobs:
1112
# This workflow contains a single job called "build"

‎.github/workflows/pr-description-validation.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: actions/checkout@v6
2525

2626
- name: Check PR description
27-
uses: actions/github-script@v8
27+
uses: actions/github-script@v9
2828
with:
2929
script: |
3030
const pr = context.payload.pull_request;

‎.github/workflows/qa-reviewer-assignment.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
steps:
2424

2525
- name: 'Assign QA Team'
26-
uses: actions/github-script@v8
26+
uses: actions/github-script@v9
2727
with:
2828
github-token: ${{ secrets.GH_TOKEN }}
2929
script: |

‎.yamato/_triggers.yml‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ pr_minimal_required_checks:
5858
(pull_request.comment eq "ngo" OR
5959
(pull_request.target eq "develop" OR
6060
pull_request.target eq "develop-2.0.0" OR
61+
pull_request.target eq "develop-3.x.x" OR
6162
pull_request.target match "release/*")) AND
6263
NOT pull_request.draft
6364
cancel_old_ci: true
@@ -75,25 +76,26 @@ pr_code_changes_checks:
7576
# 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
7677
- .yamato/vetting-test.yml#vetting_test
7778

78-
# Run package EditMode and Playmode package tests on 6000.5 and an older supported editor (6000.0)
79-
- .yamato/package-tests.yml#package_test_-_ngo_6000.5_mac
80-
- .yamato/package-tests.yml#package_test_-_ngo_6000.0_win
79+
# Run package EditMode and Playmode package tests on trunk and an older supported editor (6000.3)
80+
- .yamato/package-tests.yml#package_test_-_ngo_trunk_mac
81+
- .yamato/package-tests.yml#package_test_-_ngo_6000.3_win
8182

82-
# Run testproject EditMode and Playmode project tests on 6000.5 and an older supported editor (6000.0)
83-
- .yamato/project-tests.yml#test_testproject_win_6000.5
84-
- .yamato/project-tests.yml#test_testproject_mac_6000.0
83+
# Run testproject EditMode and Playmode project tests on trunk and an older supported editor (6000.3)
84+
- .yamato/project-tests.yml#test_testproject_win_trunk
85+
- .yamato/project-tests.yml#test_testproject_mac_6000.3
8586

8687
# Run standalone test. We run it only on Ubuntu since it's the fastest machine, and it was noted that for example distribution on macOS is taking 40m since we switched to Apple Silicon
8788
# Coverage on other standalone machines is present in Nightly job so it's enough to not run all of them for PRs
8889
# desktop_standalone_test and cmb_service_standalone_test are both reusing desktop_standalone_build dependency so we run those in the same configuration on PRs to reduce waiting time.
89-
# Note that our daily tests will anyway run both test configurations in "minimal supported" and "6000.5" configurations
90-
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_6000.5
91-
- .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_6000.5
90+
# Note that our daily tests will anyway run both test configurations in "minimal supported" and "trunk" configurations
91+
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_trunk
92+
- .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_trunk
9293
triggers:
9394
expression: |-
9495
(pull_request.comment eq "ngo" OR
9596
(pull_request.target eq "develop" OR
9697
pull_request.target eq "develop-2.0.0" OR
98+
pull_request.target eq "develop-3.x.x" OR
9799
pull_request.target match "release/*")) AND
98100
NOT pull_request.draft AND
99101
pull_request.changes.any match [

‎.yamato/project.metafile‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
small_agent_platform:
2525
- name: ubuntu
2626
type: Unity::VM
27-
image: package-ci/ubuntu-22.04:v4.82.0
27+
image: package-ci/ubuntu-22.04:v4.83.0
2828
flavor: b1.small
2929

3030

@@ -39,13 +39,13 @@ test_platforms:
3939
default:
4040
- name: ubuntu
4141
type: Unity::VM
42-
image: package-ci/ubuntu-22.04:v4.82.0
42+
image: package-ci/ubuntu-22.04:v4.83.0
4343
flavor: b1.large
4444
standalone: StandaloneLinux64
4545
desktop:
4646
- name: ubuntu
4747
type: Unity::VM
48-
image: package-ci/ubuntu-22.04:v4.82.0
48+
image: package-ci/ubuntu-22.04:v4.83.0
4949
flavor: b1.large
5050
smaller_flavor: b1.medium
5151
larger_flavor: b1.xlarge
@@ -176,13 +176,12 @@ validation_editors:
176176
default:
177177
- 6000.3
178178
all:
179-
- 6000.0
180179
- 6000.3
181180
- 6000.4
182181
- 6000.5
183182
- trunk
184183
minimal:
185-
- 6000.0
184+
- 6000.3
186185

187186

188187
# Scripting backends used by Standalone RunTimeTests---------------------------------------------------

‎.yamato/wrench/api-validation-jobs.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
### Auto-generated by Recipe Engine, DO NOT EDIT. ###
44
### ###
55
#######################################################
6+
# Source: RecipeEngine.Modules.Wrench.Recipes.ApiValidationJobs
67
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
78
all_api_validation_jobs:
89
name: All API Validation Jobs
@@ -17,7 +18,7 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_win10:
1718
type: Unity::VM
1819
flavor: b1.large
1920
commands:
20-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
21+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
2122
- command: 7z x -aoa wrench-localapv.zip
2223
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
2324
- command: python PythonScripts/print_machine_info.py
@@ -59,8 +60,8 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_win10:
5960
UNITY_LICENSING_SERVER_DELETE_NUL: 0
6061
UNITY_LICENSING_SERVER_DELETE_ULF: 0
6162
UNITY_LICENSING_SERVER_TOOLSET: pro
62-
UPMPVP_CONTEXT_WRENCH: 2.3.3.0
63+
UPMPVP_CONTEXT_WRENCH: 2.7.0.0
6364
metadata:
6465
Job Maintainers: '#rm-packageworks'
65-
Wrench: 2.3.3.0
66+
Wrench: 2.7.0.0
6667

‎.yamato/wrench/package-pack-jobs.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
### Auto-generated by Recipe Engine, DO NOT EDIT. ###
44
### ###
55
#######################################################
6+
# Source: RecipeEngine.Modules.Wrench.Recipes.PackagePackJobs
67
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
78

89
# Pack Netcode for GameObjects
@@ -28,5 +29,5 @@ package_pack_-_netcode_gameobjects:
2829
UPMCI_ACK_LARGE_PACKAGE: 1
2930
metadata:
3031
Job Maintainers: '#rm-packageworks'
31-
Wrench: 2.3.3.0
32+
Wrench: 2.7.0.0
3233

‎.yamato/wrench/player-build.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
### Auto-generated by Recipe Engine, DO NOT EDIT. ###
44
### ###
55
#######################################################
6+
# Source: RecipeEngine.Modules.Wrench.Recipes.PlayerBuild
67
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
78
{}
89

‎.yamato/wrench/player-test.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
### Auto-generated by Recipe Engine, DO NOT EDIT. ###
44
### ###
55
#######################################################
6+
# Source: RecipeEngine.Modules.Wrench.Recipes.PlayerTest
67
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
78
{}
89

0 commit comments

Comments
 (0)