Skip to content

Commit 6748679

Browse files
ci: [Backport] Updated Wrench to 1.0.0 (#3607)
## Purpose of this PR This PR aims to update Wrench to 1.0.0 which fixes some issues with latest editor in Wrench scripts/Packageworks. We need to bump this before branching to new release to mitigate errors that we will encounter otherwise After updating the version I needed to bump several other PackageReferences in order for it to be compatible and I regenerated recipes. ### Jira ticket N/A ### Changelog N/A ## Documentation - No documentation changes or additions were necessary. ## Testing & QA Green CI run is enough ## Backport #3606
1 parent 1edc2ab commit 6748679

File tree

10 files changed

+69
-489
lines changed

10 files changed

+69
-489
lines changed

.github/workflows/conventional-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
steps:
1818
- name: semantic-pull-request
1919
# Internal Unity mirror available at jesseo/action-semantic-pull-request, but actions from private repos aren't supported, so continue to use the public one below
20-
uses: amannn/action-semantic-pull-request@v5
20+
uses: amannn/action-semantic-pull-request@v6
2121
env:
2222
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2323
with:

.github/workflows/pr-verification.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: Checkout code
24-
uses: actions/checkout@v4
24+
uses: actions/checkout@v5
2525

2626
- name: Check PR description
2727
uses: actions/github-script@v7

.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.2.0
54+
UPMPVP_CONTEXT_WRENCH: 1.0.0.0
5555
metadata:
5656
Job Maintainers: '#rm-packageworks'
57-
Wrench: 0.12.2.0
57+
Wrench: 1.0.0.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.2.0
27+
Wrench: 1.0.0.0
2828

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

Lines changed: 27 additions & 193 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,12 @@ all_preview_apv_jobs:
1414
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_macos
1515
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_ubuntu
1616
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_windows
17-
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_1_-_macos
18-
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_1_-_ubuntu
19-
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_1_-_windows
2017
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_macos
2118
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_ubuntu
2219
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_windows
2320
metadata:
2421
Job Maintainers: '#rm-packageworks'
25-
Wrench: 0.12.2.0
22+
Wrench: 1.0.0.0
2623

2724
# Functional tests for dependents found in the latest 2021.3 manifest (MacOS).
2825
preview_apv_-_2021_3_-_macos:
@@ -73,10 +70,10 @@ preview_apv_-_2021_3_-_macos:
7370
dependencies:
7471
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
7572
variables:
76-
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
73+
UPMPVP_CONTEXT_WRENCH: 1.0.0.0
7774
metadata:
7875
Job Maintainers: '#rm-packageworks'
79-
Wrench: 0.12.2.0
76+
Wrench: 1.0.0.0
8077

8178
# Functional tests for dependents found in the latest 2021.3 manifest (Ubuntu).
8279
preview_apv_-_2021_3_-_ubuntu:
@@ -127,10 +124,10 @@ preview_apv_-_2021_3_-_ubuntu:
127124
dependencies:
128125
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
129126
variables:
130-
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
127+
UPMPVP_CONTEXT_WRENCH: 1.0.0.0
131128
metadata:
132129
Job Maintainers: '#rm-packageworks'
133-
Wrench: 0.12.2.0
130+
Wrench: 1.0.0.0
134131

135132
# Functional tests for dependents found in the latest 2021.3 manifest (Windows).
136133
preview_apv_-_2021_3_-_windows:
@@ -182,10 +179,10 @@ preview_apv_-_2021_3_-_windows:
182179
dependencies:
183180
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
184181
variables:
185-
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
182+
UPMPVP_CONTEXT_WRENCH: 1.0.0.0
186183
metadata:
187184
Job Maintainers: '#rm-packageworks'
188-
Wrench: 0.12.2.0
185+
Wrench: 1.0.0.0
189186

190187
# Functional tests for dependents found in the latest 2022.3 manifest (MacOS).
191188
preview_apv_-_2022_3_-_macos:
@@ -236,10 +233,10 @@ preview_apv_-_2022_3_-_macos:
236233
dependencies:
237234
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
238235
variables:
239-
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
236+
UPMPVP_CONTEXT_WRENCH: 1.0.0.0
240237
metadata:
241238
Job Maintainers: '#rm-packageworks'
242-
Wrench: 0.12.2.0
239+
Wrench: 1.0.0.0
243240

244241
# Functional tests for dependents found in the latest 2022.3 manifest (Ubuntu).
245242
preview_apv_-_2022_3_-_ubuntu:
@@ -290,10 +287,10 @@ preview_apv_-_2022_3_-_ubuntu:
290287
dependencies:
291288
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
292289
variables:
293-
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
290+
UPMPVP_CONTEXT_WRENCH: 1.0.0.0
294291
metadata:
295292
Job Maintainers: '#rm-packageworks'
296-
Wrench: 0.12.2.0
293+
Wrench: 1.0.0.0
297294

298295
# Functional tests for dependents found in the latest 2022.3 manifest (Windows).
299296
preview_apv_-_2022_3_-_windows:
@@ -345,10 +342,10 @@ preview_apv_-_2022_3_-_windows:
345342
dependencies:
346343
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
347344
variables:
348-
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
345+
UPMPVP_CONTEXT_WRENCH: 1.0.0.0
349346
metadata:
350347
Job Maintainers: '#rm-packageworks'
351-
Wrench: 0.12.2.0
348+
Wrench: 1.0.0.0
352349

353350
# Functional tests for dependents found in the latest 6000.0 manifest (MacOS).
354351
preview_apv_-_6000_0_-_macos:
@@ -399,16 +396,16 @@ preview_apv_-_6000_0_-_macos:
399396
dependencies:
400397
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
401398
variables:
402-
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
399+
UPMPVP_CONTEXT_WRENCH: 1.0.0.0
403400
metadata:
404401
Job Maintainers: '#rm-packageworks'
405-
Wrench: 0.12.2.0
402+
Wrench: 1.0.0.0
406403

407404
# Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu).
408405
preview_apv_-_6000_0_-_ubuntu:
409406
name: Preview APV - 6000.0 - ubuntu
410407
agent:
411-
image: package-ci/ubuntu-20.04:default
408+
image: package-ci/ubuntu-22.04:v4
412409
type: Unity::VM
413410
flavor: b1.large
414411
commands:
@@ -453,10 +450,10 @@ preview_apv_-_6000_0_-_ubuntu:
453450
dependencies:
454451
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
455452
variables:
456-
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
453+
UPMPVP_CONTEXT_WRENCH: 1.0.0.0
457454
metadata:
458455
Job Maintainers: '#rm-packageworks'
459-
Wrench: 0.12.2.0
456+
Wrench: 1.0.0.0
460457

461458
# Functional tests for dependents found in the latest 6000.0 manifest (Windows).
462459
preview_apv_-_6000_0_-_windows:
@@ -508,173 +505,10 @@ preview_apv_-_6000_0_-_windows:
508505
dependencies:
509506
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
510507
variables:
511-
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
512-
metadata:
513-
Job Maintainers: '#rm-packageworks'
514-
Wrench: 0.12.2.0
515-
516-
# Functional tests for dependents found in the latest 6000.1 manifest (MacOS).
517-
preview_apv_-_6000_1_-_macos:
518-
name: Preview APV - 6000.1 - macos
519-
agent:
520-
image: package-ci/macos-13:default
521-
type: Unity::VM::osx
522-
flavor: b1.xlarge
523-
commands:
524-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
525-
- command: 7z x -aoa wrench-localapv.zip
526-
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
527-
- command: python PythonScripts/print_machine_info.py
528-
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
529-
timeout: 20
530-
retries: 10
531-
- command: unity-downloader-cli -u 6000.1/staging -c editor --path .Editor --fast
532-
timeout: 10
533-
retries: 3
534-
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.1 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
535-
- command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
536-
after:
537-
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
538-
artifacts:
539-
Crash Dumps:
540-
paths:
541-
- CrashDumps/**
542-
logs:
543-
paths:
544-
- '*.log'
545-
- '*.xml'
546-
- upm-ci~/test-results/**/*
547-
- upm-ci~/temp/*/Logs/**
548-
- upm-ci~/temp/*/Library/*.log
549-
- upm-ci~/temp/*/*.log
550-
- upm-ci~/temp/Builds/*.log
551-
packages:
552-
paths:
553-
- upm-ci~/packages/**/*
554-
PreviewAPVResults:
555-
paths:
556-
- PreviewApvArtifacts~/**
557-
- APVTest/**/manifest.json
558-
pvp-results:
559-
paths:
560-
- upm-ci~/pvp/**/*
561-
browsable: onDemand
562-
dependencies:
563-
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
564-
variables:
565-
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
508+
UPMPVP_CONTEXT_WRENCH: 1.0.0.0
566509
metadata:
567510
Job Maintainers: '#rm-packageworks'
568-
Wrench: 0.12.2.0
569-
570-
# Functional tests for dependents found in the latest 6000.1 manifest (Ubuntu).
571-
preview_apv_-_6000_1_-_ubuntu:
572-
name: Preview APV - 6000.1 - ubuntu
573-
agent:
574-
image: package-ci/ubuntu-20.04:default
575-
type: Unity::VM
576-
flavor: b1.large
577-
commands:
578-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
579-
- command: 7z x -aoa wrench-localapv.zip
580-
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
581-
- command: python PythonScripts/print_machine_info.py
582-
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
583-
timeout: 20
584-
retries: 10
585-
- command: unity-downloader-cli -u 6000.1/staging -c editor --path .Editor --fast
586-
timeout: 10
587-
retries: 3
588-
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.1 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
589-
- command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
590-
after:
591-
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
592-
artifacts:
593-
Crash Dumps:
594-
paths:
595-
- CrashDumps/**
596-
logs:
597-
paths:
598-
- '*.log'
599-
- '*.xml'
600-
- upm-ci~/test-results/**/*
601-
- upm-ci~/temp/*/Logs/**
602-
- upm-ci~/temp/*/Library/*.log
603-
- upm-ci~/temp/*/*.log
604-
- upm-ci~/temp/Builds/*.log
605-
packages:
606-
paths:
607-
- upm-ci~/packages/**/*
608-
PreviewAPVResults:
609-
paths:
610-
- PreviewApvArtifacts~/**
611-
- APVTest/**/manifest.json
612-
pvp-results:
613-
paths:
614-
- upm-ci~/pvp/**/*
615-
browsable: onDemand
616-
dependencies:
617-
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
618-
variables:
619-
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
620-
metadata:
621-
Job Maintainers: '#rm-packageworks'
622-
Wrench: 0.12.2.0
623-
624-
# Functional tests for dependents found in the latest 6000.1 manifest (Windows).
625-
preview_apv_-_6000_1_-_windows:
626-
name: Preview APV - 6000.1 - windows
627-
agent:
628-
image: package-ci/win10:default
629-
type: Unity::VM
630-
flavor: b1.large
631-
commands:
632-
- command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f
633-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
634-
- command: 7z x -aoa wrench-localapv.zip
635-
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
636-
- command: python PythonScripts/print_machine_info.py
637-
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
638-
timeout: 20
639-
retries: 10
640-
- command: unity-downloader-cli -u 6000.1/staging -c editor --path .Editor --fast
641-
timeout: 10
642-
retries: 3
643-
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.1 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
644-
- command: python PythonScripts/editor_manifest_validator.py --version=6000.1 --wrench-config=.yamato/wrench/wrench_config.json
645-
after:
646-
- command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
647-
artifacts:
648-
Crash Dumps:
649-
paths:
650-
- CrashDumps/**
651-
logs:
652-
paths:
653-
- '*.log'
654-
- '*.xml'
655-
- upm-ci~/test-results/**/*
656-
- upm-ci~/temp/*/Logs/**
657-
- upm-ci~/temp/*/Library/*.log
658-
- upm-ci~/temp/*/*.log
659-
- upm-ci~/temp/Builds/*.log
660-
packages:
661-
paths:
662-
- upm-ci~/packages/**/*
663-
PreviewAPVResults:
664-
paths:
665-
- PreviewApvArtifacts~/**
666-
- APVTest/**/manifest.json
667-
pvp-results:
668-
paths:
669-
- upm-ci~/pvp/**/*
670-
browsable: onDemand
671-
dependencies:
672-
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
673-
variables:
674-
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
675-
metadata:
676-
Job Maintainers: '#rm-packageworks'
677-
Wrench: 0.12.2.0
511+
Wrench: 1.0.0.0
678512

679513
# Functional tests for dependents found in the latest 6000.2 manifest (MacOS).
680514
preview_apv_-_6000_2_-_macos:
@@ -725,16 +559,16 @@ preview_apv_-_6000_2_-_macos:
725559
dependencies:
726560
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
727561
variables:
728-
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
562+
UPMPVP_CONTEXT_WRENCH: 1.0.0.0
729563
metadata:
730564
Job Maintainers: '#rm-packageworks'
731-
Wrench: 0.12.2.0
565+
Wrench: 1.0.0.0
732566

733567
# Functional tests for dependents found in the latest 6000.2 manifest (Ubuntu).
734568
preview_apv_-_6000_2_-_ubuntu:
735569
name: Preview APV - 6000.2 - ubuntu
736570
agent:
737-
image: package-ci/ubuntu-20.04:default
571+
image: package-ci/ubuntu-22.04:v4
738572
type: Unity::VM
739573
flavor: b1.large
740574
commands:
@@ -779,10 +613,10 @@ preview_apv_-_6000_2_-_ubuntu:
779613
dependencies:
780614
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
781615
variables:
782-
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
616+
UPMPVP_CONTEXT_WRENCH: 1.0.0.0
783617
metadata:
784618
Job Maintainers: '#rm-packageworks'
785-
Wrench: 0.12.2.0
619+
Wrench: 1.0.0.0
786620

787621
# Functional tests for dependents found in the latest 6000.2 manifest (Windows).
788622
preview_apv_-_6000_2_-_windows:
@@ -834,8 +668,8 @@ preview_apv_-_6000_2_-_windows:
834668
dependencies:
835669
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
836670
variables:
837-
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
671+
UPMPVP_CONTEXT_WRENCH: 1.0.0.0
838672
metadata:
839673
Job Maintainers: '#rm-packageworks'
840-
Wrench: 0.12.2.0
674+
Wrench: 1.0.0.0
841675

0 commit comments

Comments
 (0)