Skip to content

Commit 04ebf97

Browse files
jabbacakesjabbacakes
authored
Merge branch 'develop' into develop-docs
2 parents 2f6e473 + 03f5c64 commit 04ebf97

File tree

9 files changed

+87
-86
lines changed

9 files changed

+87
-86
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ AssemblyInfo.cs @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
99
.gitignore @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
1010
.github/ @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
1111
.yamato/ @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
12+
com.unity.netcode.gameobjects/Documentation*/ @jabbacakes

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ api_validation_-_netcode_gameobjects_-_2021_3_-_windows:
5151
dependencies:
5252
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
5353
variables:
54-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
54+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
5555
metadata:
5656
Job Maintainers: '#rm-packageworks'
57-
Wrench: 0.12.1.0
57+
Wrench: 0.12.2.0
5858

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ package_pack_-_netcode_gameobjects:
2424
UPMCI_ACK_LARGE_PACKAGE: 1
2525
metadata:
2626
Job Maintainers: '#rm-packageworks'
27-
Wrench: 0.12.1.0
27+
Wrench: 0.12.2.0
2828

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

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ all_preview_apv_jobs:
2525
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_windows
2626
metadata:
2727
Job Maintainers: '#rm-packageworks'
28-
Wrench: 0.12.1.0
28+
Wrench: 0.12.2.0
2929

3030
# Functional tests for dependents found in the latest 2021.3 manifest (MacOS).
3131
preview_apv_-_2021_3_-_macos:
@@ -76,10 +76,10 @@ preview_apv_-_2021_3_-_macos:
7676
dependencies:
7777
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
7878
variables:
79-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
79+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
8080
metadata:
8181
Job Maintainers: '#rm-packageworks'
82-
Wrench: 0.12.1.0
82+
Wrench: 0.12.2.0
8383

8484
# Functional tests for dependents found in the latest 2021.3 manifest (Ubuntu).
8585
preview_apv_-_2021_3_-_ubuntu:
@@ -130,10 +130,10 @@ preview_apv_-_2021_3_-_ubuntu:
130130
dependencies:
131131
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
132132
variables:
133-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
133+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
134134
metadata:
135135
Job Maintainers: '#rm-packageworks'
136-
Wrench: 0.12.1.0
136+
Wrench: 0.12.2.0
137137

138138
# Functional tests for dependents found in the latest 2021.3 manifest (Windows).
139139
preview_apv_-_2021_3_-_windows:
@@ -185,10 +185,10 @@ preview_apv_-_2021_3_-_windows:
185185
dependencies:
186186
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
187187
variables:
188-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
188+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
189189
metadata:
190190
Job Maintainers: '#rm-packageworks'
191-
Wrench: 0.12.1.0
191+
Wrench: 0.12.2.0
192192

193193
# Functional tests for dependents found in the latest 2022.3 manifest (MacOS).
194194
preview_apv_-_2022_3_-_macos:
@@ -239,10 +239,10 @@ preview_apv_-_2022_3_-_macos:
239239
dependencies:
240240
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
241241
variables:
242-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
242+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
243243
metadata:
244244
Job Maintainers: '#rm-packageworks'
245-
Wrench: 0.12.1.0
245+
Wrench: 0.12.2.0
246246

247247
# Functional tests for dependents found in the latest 2022.3 manifest (Ubuntu).
248248
preview_apv_-_2022_3_-_ubuntu:
@@ -293,10 +293,10 @@ preview_apv_-_2022_3_-_ubuntu:
293293
dependencies:
294294
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
295295
variables:
296-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
296+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
297297
metadata:
298298
Job Maintainers: '#rm-packageworks'
299-
Wrench: 0.12.1.0
299+
Wrench: 0.12.2.0
300300

301301
# Functional tests for dependents found in the latest 2022.3 manifest (Windows).
302302
preview_apv_-_2022_3_-_windows:
@@ -348,10 +348,10 @@ preview_apv_-_2022_3_-_windows:
348348
dependencies:
349349
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
350350
variables:
351-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
351+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
352352
metadata:
353353
Job Maintainers: '#rm-packageworks'
354-
Wrench: 0.12.1.0
354+
Wrench: 0.12.2.0
355355

356356
# Functional tests for dependents found in the latest 6000.0 manifest (MacOS).
357357
preview_apv_-_6000_0_-_macos:
@@ -402,10 +402,10 @@ preview_apv_-_6000_0_-_macos:
402402
dependencies:
403403
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
404404
variables:
405-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
405+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
406406
metadata:
407407
Job Maintainers: '#rm-packageworks'
408-
Wrench: 0.12.1.0
408+
Wrench: 0.12.2.0
409409

410410
# Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu).
411411
preview_apv_-_6000_0_-_ubuntu:
@@ -456,10 +456,10 @@ preview_apv_-_6000_0_-_ubuntu:
456456
dependencies:
457457
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
458458
variables:
459-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
459+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
460460
metadata:
461461
Job Maintainers: '#rm-packageworks'
462-
Wrench: 0.12.1.0
462+
Wrench: 0.12.2.0
463463

464464
# Functional tests for dependents found in the latest 6000.0 manifest (Windows).
465465
preview_apv_-_6000_0_-_windows:
@@ -511,10 +511,10 @@ preview_apv_-_6000_0_-_windows:
511511
dependencies:
512512
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
513513
variables:
514-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
514+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
515515
metadata:
516516
Job Maintainers: '#rm-packageworks'
517-
Wrench: 0.12.1.0
517+
Wrench: 0.12.2.0
518518

519519
# Functional tests for dependents found in the latest 6000.1 manifest (MacOS).
520520
preview_apv_-_6000_1_-_macos:
@@ -565,10 +565,10 @@ preview_apv_-_6000_1_-_macos:
565565
dependencies:
566566
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
567567
variables:
568-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
568+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
569569
metadata:
570570
Job Maintainers: '#rm-packageworks'
571-
Wrench: 0.12.1.0
571+
Wrench: 0.12.2.0
572572

573573
# Functional tests for dependents found in the latest 6000.1 manifest (Ubuntu).
574574
preview_apv_-_6000_1_-_ubuntu:
@@ -619,10 +619,10 @@ preview_apv_-_6000_1_-_ubuntu:
619619
dependencies:
620620
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
621621
variables:
622-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
622+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
623623
metadata:
624624
Job Maintainers: '#rm-packageworks'
625-
Wrench: 0.12.1.0
625+
Wrench: 0.12.2.0
626626

627627
# Functional tests for dependents found in the latest 6000.1 manifest (Windows).
628628
preview_apv_-_6000_1_-_windows:
@@ -674,10 +674,10 @@ preview_apv_-_6000_1_-_windows:
674674
dependencies:
675675
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
676676
variables:
677-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
677+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
678678
metadata:
679679
Job Maintainers: '#rm-packageworks'
680-
Wrench: 0.12.1.0
680+
Wrench: 0.12.2.0
681681

682682
# Functional tests for dependents found in the latest 6000.2 manifest (MacOS).
683683
preview_apv_-_6000_2_-_macos:
@@ -728,10 +728,10 @@ preview_apv_-_6000_2_-_macos:
728728
dependencies:
729729
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
730730
variables:
731-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
731+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
732732
metadata:
733733
Job Maintainers: '#rm-packageworks'
734-
Wrench: 0.12.1.0
734+
Wrench: 0.12.2.0
735735

736736
# Functional tests for dependents found in the latest 6000.2 manifest (Ubuntu).
737737
preview_apv_-_6000_2_-_ubuntu:
@@ -782,10 +782,10 @@ preview_apv_-_6000_2_-_ubuntu:
782782
dependencies:
783783
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
784784
variables:
785-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
785+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
786786
metadata:
787787
Job Maintainers: '#rm-packageworks'
788-
Wrench: 0.12.1.0
788+
Wrench: 0.12.2.0
789789

790790
# Functional tests for dependents found in the latest 6000.2 manifest (Windows).
791791
preview_apv_-_6000_2_-_windows:
@@ -837,10 +837,10 @@ preview_apv_-_6000_2_-_windows:
837837
dependencies:
838838
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
839839
variables:
840-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
840+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
841841
metadata:
842842
Job Maintainers: '#rm-packageworks'
843-
Wrench: 0.12.1.0
843+
Wrench: 0.12.2.0
844844

845845
# Functional tests for dependents found in the latest 6000.3 manifest (MacOS).
846846
preview_apv_-_6000_3_-_macos:
@@ -891,10 +891,10 @@ preview_apv_-_6000_3_-_macos:
891891
dependencies:
892892
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
893893
variables:
894-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
894+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
895895
metadata:
896896
Job Maintainers: '#rm-packageworks'
897-
Wrench: 0.12.1.0
897+
Wrench: 0.12.2.0
898898

899899
# Functional tests for dependents found in the latest 6000.3 manifest (Ubuntu).
900900
preview_apv_-_6000_3_-_ubuntu:
@@ -945,10 +945,10 @@ preview_apv_-_6000_3_-_ubuntu:
945945
dependencies:
946946
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
947947
variables:
948-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
948+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
949949
metadata:
950950
Job Maintainers: '#rm-packageworks'
951-
Wrench: 0.12.1.0
951+
Wrench: 0.12.2.0
952952

953953
# Functional tests for dependents found in the latest 6000.3 manifest (Windows).
954954
preview_apv_-_6000_3_-_windows:
@@ -1000,8 +1000,8 @@ preview_apv_-_6000_3_-_windows:
10001000
dependencies:
10011001
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
10021002
variables:
1003-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
1003+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
10041004
metadata:
10051005
Job Maintainers: '#rm-packageworks'
1006-
Wrench: 0.12.1.0
1006+
Wrench: 0.12.2.0
10071007

‎.yamato/wrench/promotion-jobs.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,10 @@ publish_dry_run_netcode_gameobjects:
208208
ignore_artifact: true
209209
variables:
210210
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
211-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
211+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
212212
metadata:
213213
Job Maintainers: '#rm-packageworks'
214-
Wrench: 0.12.1.0
214+
Wrench: 0.12.2.0
215215

216216
# Publish for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
217217
publish_netcode_gameobjects:
@@ -420,8 +420,8 @@ publish_netcode_gameobjects:
420420
ignore_artifact: true
421421
variables:
422422
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
423-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
423+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
424424
metadata:
425425
Job Maintainers: '#rm-packageworks'
426-
Wrench: 0.12.1.0
426+
Wrench: 0.12.2.0
427427

‎.yamato/wrench/recipe-regeneration.yml‎

Lines changed: 3 additions & 3 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:
@@ -26,5 +26,5 @@ test_-_wrench_jobs_up_to_date:
2626
cancel_old_ci: true
2727
metadata:
2828
Job Maintainers: '#rm-packageworks'
29-
Wrench: 0.12.1.0
29+
Wrench: 0.12.2.0
3030

0 commit comments

Comments
 (0)