Skip to content

Commit b5a381b

Browse files
jabbacakesjabbacakes
authored
Merge branch 'develop-2.0.0' into develop-2.0.0-docs
2 parents 9a5b52a + ff571bc commit b5a381b

File tree

8 files changed

+62
-62
lines changed

8 files changed

+62
-62
lines changed

‎.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_-_6000_0_-_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: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ all_preview_apv_jobs:
1919
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_windows
2020
metadata:
2121
Job Maintainers: '#rm-packageworks'
22-
Wrench: 0.12.1.0
22+
Wrench: 0.12.2.0
2323

2424
# Functional tests for dependents found in the latest 6000.0 manifest (MacOS).
2525
preview_apv_-_6000_0_-_macos:
@@ -70,10 +70,10 @@ preview_apv_-_6000_0_-_macos:
7070
dependencies:
7171
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
7272
variables:
73-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
73+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
7474
metadata:
7575
Job Maintainers: '#rm-packageworks'
76-
Wrench: 0.12.1.0
76+
Wrench: 0.12.2.0
7777

7878
# Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu).
7979
preview_apv_-_6000_0_-_ubuntu:
@@ -124,10 +124,10 @@ preview_apv_-_6000_0_-_ubuntu:
124124
dependencies:
125125
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
126126
variables:
127-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
127+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
128128
metadata:
129129
Job Maintainers: '#rm-packageworks'
130-
Wrench: 0.12.1.0
130+
Wrench: 0.12.2.0
131131

132132
# Functional tests for dependents found in the latest 6000.0 manifest (Windows).
133133
preview_apv_-_6000_0_-_windows:
@@ -179,10 +179,10 @@ preview_apv_-_6000_0_-_windows:
179179
dependencies:
180180
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
181181
variables:
182-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
182+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
183183
metadata:
184184
Job Maintainers: '#rm-packageworks'
185-
Wrench: 0.12.1.0
185+
Wrench: 0.12.2.0
186186

187187
# Functional tests for dependents found in the latest 6000.1 manifest (MacOS).
188188
preview_apv_-_6000_1_-_macos:
@@ -233,10 +233,10 @@ preview_apv_-_6000_1_-_macos:
233233
dependencies:
234234
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
235235
variables:
236-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
236+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
237237
metadata:
238238
Job Maintainers: '#rm-packageworks'
239-
Wrench: 0.12.1.0
239+
Wrench: 0.12.2.0
240240

241241
# Functional tests for dependents found in the latest 6000.1 manifest (Ubuntu).
242242
preview_apv_-_6000_1_-_ubuntu:
@@ -287,10 +287,10 @@ preview_apv_-_6000_1_-_ubuntu:
287287
dependencies:
288288
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
289289
variables:
290-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
290+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
291291
metadata:
292292
Job Maintainers: '#rm-packageworks'
293-
Wrench: 0.12.1.0
293+
Wrench: 0.12.2.0
294294

295295
# Functional tests for dependents found in the latest 6000.1 manifest (Windows).
296296
preview_apv_-_6000_1_-_windows:
@@ -342,10 +342,10 @@ preview_apv_-_6000_1_-_windows:
342342
dependencies:
343343
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
344344
variables:
345-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
345+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
346346
metadata:
347347
Job Maintainers: '#rm-packageworks'
348-
Wrench: 0.12.1.0
348+
Wrench: 0.12.2.0
349349

350350
# Functional tests for dependents found in the latest 6000.2 manifest (MacOS).
351351
preview_apv_-_6000_2_-_macos:
@@ -396,10 +396,10 @@ preview_apv_-_6000_2_-_macos:
396396
dependencies:
397397
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
398398
variables:
399-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
399+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
400400
metadata:
401401
Job Maintainers: '#rm-packageworks'
402-
Wrench: 0.12.1.0
402+
Wrench: 0.12.2.0
403403

404404
# Functional tests for dependents found in the latest 6000.2 manifest (Ubuntu).
405405
preview_apv_-_6000_2_-_ubuntu:
@@ -450,10 +450,10 @@ preview_apv_-_6000_2_-_ubuntu:
450450
dependencies:
451451
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
452452
variables:
453-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
453+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
454454
metadata:
455455
Job Maintainers: '#rm-packageworks'
456-
Wrench: 0.12.1.0
456+
Wrench: 0.12.2.0
457457

458458
# Functional tests for dependents found in the latest 6000.2 manifest (Windows).
459459
preview_apv_-_6000_2_-_windows:
@@ -505,10 +505,10 @@ preview_apv_-_6000_2_-_windows:
505505
dependencies:
506506
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
507507
variables:
508-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
508+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
509509
metadata:
510510
Job Maintainers: '#rm-packageworks'
511-
Wrench: 0.12.1.0
511+
Wrench: 0.12.2.0
512512

513513
# Functional tests for dependents found in the latest 6000.3 manifest (MacOS).
514514
preview_apv_-_6000_3_-_macos:
@@ -559,10 +559,10 @@ preview_apv_-_6000_3_-_macos:
559559
dependencies:
560560
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
561561
variables:
562-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
562+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
563563
metadata:
564564
Job Maintainers: '#rm-packageworks'
565-
Wrench: 0.12.1.0
565+
Wrench: 0.12.2.0
566566

567567
# Functional tests for dependents found in the latest 6000.3 manifest (Ubuntu).
568568
preview_apv_-_6000_3_-_ubuntu:
@@ -613,10 +613,10 @@ preview_apv_-_6000_3_-_ubuntu:
613613
dependencies:
614614
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
615615
variables:
616-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
616+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
617617
metadata:
618618
Job Maintainers: '#rm-packageworks'
619-
Wrench: 0.12.1.0
619+
Wrench: 0.12.2.0
620620

621621
# Functional tests for dependents found in the latest 6000.3 manifest (Windows).
622622
preview_apv_-_6000_3_-_windows:
@@ -668,8 +668,8 @@ preview_apv_-_6000_3_-_windows:
668668
dependencies:
669669
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
670670
variables:
671-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
671+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
672672
metadata:
673673
Job Maintainers: '#rm-packageworks'
674-
Wrench: 0.12.1.0
674+
Wrench: 0.12.2.0
675675

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,10 @@ publish_dry_run_netcode_gameobjects:
148148
ignore_artifact: true
149149
variables:
150150
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
151-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
151+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
152152
metadata:
153153
Job Maintainers: '#rm-packageworks'
154-
Wrench: 0.12.1.0
154+
Wrench: 0.12.2.0
155155

156156
# Publish for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
157157
publish_netcode_gameobjects:
@@ -300,8 +300,8 @@ publish_netcode_gameobjects:
300300
ignore_artifact: true
301301
variables:
302302
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
303-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
303+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
304304
metadata:
305305
Job Maintainers: '#rm-packageworks'
306-
Wrench: 0.12.1.0
306+
Wrench: 0.12.2.0
307307

‎.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

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_macos:
6060
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
6161
variables:
6262
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
63-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
63+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
6464
metadata:
6565
Job Maintainers: '#rm-packageworks'
66-
Wrench: 0.12.1.0
66+
Wrench: 0.12.2.0
6767
labels:
6868
- Packages:netcode.gameobjects
6969

@@ -126,10 +126,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_ubuntu:
126126
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
127127
variables:
128128
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
129-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
129+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
130130
metadata:
131131
Job Maintainers: '#rm-packageworks'
132-
Wrench: 0.12.1.0
132+
Wrench: 0.12.2.0
133133
labels:
134134
- Packages:netcode.gameobjects
135135

@@ -192,10 +192,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_windows:
192192
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
193193
variables:
194194
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
195-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
195+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
196196
metadata:
197197
Job Maintainers: '#rm-packageworks'
198-
Wrench: 0.12.1.0
198+
Wrench: 0.12.2.0
199199
labels:
200200
- Packages:netcode.gameobjects
201201

@@ -258,10 +258,10 @@ validate_-_netcode_gameobjects_-_6000_1_-_macos:
258258
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
259259
variables:
260260
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
261-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
261+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
262262
metadata:
263263
Job Maintainers: '#rm-packageworks'
264-
Wrench: 0.12.1.0
264+
Wrench: 0.12.2.0
265265
labels:
266266
- Packages:netcode.gameobjects
267267

@@ -324,10 +324,10 @@ validate_-_netcode_gameobjects_-_6000_1_-_ubuntu:
324324
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
325325
variables:
326326
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
327-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
327+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
328328
metadata:
329329
Job Maintainers: '#rm-packageworks'
330-
Wrench: 0.12.1.0
330+
Wrench: 0.12.2.0
331331
labels:
332332
- Packages:netcode.gameobjects
333333

@@ -390,10 +390,10 @@ validate_-_netcode_gameobjects_-_6000_1_-_windows:
390390
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
391391
variables:
392392
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
393-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
393+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
394394
metadata:
395395
Job Maintainers: '#rm-packageworks'
396-
Wrench: 0.12.1.0
396+
Wrench: 0.12.2.0
397397
labels:
398398
- Packages:netcode.gameobjects
399399

@@ -456,10 +456,10 @@ validate_-_netcode_gameobjects_-_6000_2_-_macos:
456456
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
457457
variables:
458458
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
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
labels:
464464
- Packages:netcode.gameobjects
465465

@@ -522,10 +522,10 @@ validate_-_netcode_gameobjects_-_6000_2_-_ubuntu:
522522
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
523523
variables:
524524
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
525-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
525+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
526526
metadata:
527527
Job Maintainers: '#rm-packageworks'
528-
Wrench: 0.12.1.0
528+
Wrench: 0.12.2.0
529529
labels:
530530
- Packages:netcode.gameobjects
531531

@@ -588,10 +588,10 @@ validate_-_netcode_gameobjects_-_6000_2_-_windows:
588588
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
589589
variables:
590590
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
591-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
591+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
592592
metadata:
593593
Job Maintainers: '#rm-packageworks'
594-
Wrench: 0.12.1.0
594+
Wrench: 0.12.2.0
595595
labels:
596596
- Packages:netcode.gameobjects
597597

@@ -654,10 +654,10 @@ validate_-_netcode_gameobjects_-_6000_3_-_macos:
654654
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
655655
variables:
656656
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
657-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
657+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
658658
metadata:
659659
Job Maintainers: '#rm-packageworks'
660-
Wrench: 0.12.1.0
660+
Wrench: 0.12.2.0
661661
labels:
662662
- Packages:netcode.gameobjects
663663

@@ -720,10 +720,10 @@ validate_-_netcode_gameobjects_-_6000_3_-_ubuntu:
720720
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
721721
variables:
722722
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
723-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
723+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
724724
metadata:
725725
Job Maintainers: '#rm-packageworks'
726-
Wrench: 0.12.1.0
726+
Wrench: 0.12.2.0
727727
labels:
728728
- Packages:netcode.gameobjects
729729

@@ -786,10 +786,10 @@ validate_-_netcode_gameobjects_-_6000_3_-_windows:
786786
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
787787
variables:
788788
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
789-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
789+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
790790
metadata:
791791
Job Maintainers: '#rm-packageworks'
792-
Wrench: 0.12.1.0
792+
Wrench: 0.12.2.0
793793
labels:
794794
- Packages:netcode.gameobjects
795795

‎.yamato/wrench/wrench_config.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
},
3232
"publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_netcode_gameobjects",
3333
"branch_pattern": "ReleaseSlash",
34-
"wrench_version": "0.12.1.0",
34+
"wrench_version": "0.12.2.0",
3535
"pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json",
36-
"cs_project_path": "Tools/CI/NGO.Cookbook.csproj"
36+
"cs_project_path": "Tools\\CI\\NGO.Cookbook.csproj"
3737
}

0 commit comments

Comments
 (0)