Skip to content

Commit d319a3f

Browse files
ci: Wrench update to 1.0.0 (#3606)
## 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. For this I also noticed that BuilderScripts need to be out of CI folder so I moved them and corrected paths ### Jira ticket N/A ### Changelog N/A ## Documentation - No documentation changes or additions were necessary. ## Testing & QA Green CI run is enough ## Backport #3607
1 parent 3dcc65a commit d319a3f

18 files changed

+70
-490
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/project-builders/project-builders.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,22 @@ build_{{ netcodeProject[0] }}_project:
3232
PLATFORM_WIN64_MAC_ANDROID: win64
3333
commands:
3434
# Validate inputs passed via Yamato variables
35-
- python Tools/CI/scripts/BuildAutomation/validate_params.py
35+
- python Tools/scripts/BuildAutomation/validate_params.py
3636
- echo Building {{ netcodeProject[0] }} project with Unity version of %UNITY_VERSION%, Scripting backend %SCRIPTING_BACKEND_IL2CPP_MONO%, Burst %BURST_ON_OFF% for platform %PLATFORM_WIN64_MAC_ANDROID%
3737

3838
# Clone the external project repository into a specific directory. Notice that branch is also specified.
3939
- git clone --single-branch --branch {{ netcodeProject[1].branch }} {{ netcodeProject[1].GithubRepo }} C:/ClonedProject
4040

4141
# Modify the external project's manifest to use the local N4E package from current branch on which this Yamato job is running. (requires python that should be preinstalled in the image)
42-
- python Tools/CI/scripts/BuildAutomation/manifest_update.py --manifest-path C:/ClonedProject/{{ netcodeProject[1].manifestPath }} --local-package-path %YAMATO_SOURCE_DIR%/com.unity.netcode.gameobjects
42+
- python Tools/scripts/BuildAutomation/manifest_update.py --manifest-path C:/ClonedProject/{{ netcodeProject[1].manifestPath }} --local-package-path %YAMATO_SOURCE_DIR%/com.unity.netcode.gameobjects
4343

4444
# Run python script to update ProjectSettings.asset in order to connect the project to Unity Services/set proper values.
4545
# Notice that if a project has this already set up then in theory we don't need to run this script.
46-
- python Tools/CI/scripts/BuildAutomation/connect_services.py --project-settings-path C:/ClonedProject/{{ netcodeProject[1].projectPath }}/ProjectSettings/ProjectSettings.asset
46+
- python Tools/scripts/BuildAutomation/connect_services.py --project-settings-path C:/ClonedProject/{{ netcodeProject[1].projectPath }}/ProjectSettings/ProjectSettings.asset
4747

4848
# Enable or disable Burst compilation. This step is specific to Netcode package (or any package that uses Burst)
49-
- IF "%BURST_ON_OFF%"=="on" (python Tools/CI/scripts/BuildAutomation/disable-enable-burst.py --enable-burst --project-path C:/ClonedProject/{{ netcodeProject[1].projectPath }})
50-
ELSE (python Tools/CI/scripts/BuildAutomation/disable-enable-burst.py --disable-burst --project-path C:/ClonedProject/{{ netcodeProject[1].projectPath }})
49+
- IF "%BURST_ON_OFF%"=="on" (python Tools/scripts/BuildAutomation/disable-enable-burst.py --enable-burst --project-path C:/ClonedProject/{{ netcodeProject[1].projectPath }})
50+
ELSE (python Tools/scripts/BuildAutomation/disable-enable-burst.py --disable-burst --project-path C:/ClonedProject/{{ netcodeProject[1].projectPath }})
5151

5252
# Download the Unity Editor version specified in the UNITY_VERSION variable. Il2cpp component is downloaded only if the SCRIPTING_BACKEND_IL2CPP_MONO is set to "il2cpp".
5353
# TODO: we could download components only if needed
@@ -56,7 +56,7 @@ build_{{ netcodeProject[0] }}_project:
5656
# Add BuilderScript.cs to the project so we can modify and build the project using Unity Editor.
5757
# This is a bit tricky step, notice that we also need to include proper assembly definition in order for those scripts to compile properly.
5858
# TODO: the asmdef file can be simplified
59-
- python Tools/CI/scripts/BuildAutomation/FileCopy.py "C:/ClonedProject/{{ netcodeProject[1].projectPath }}"
59+
- python Tools/scripts/BuildAutomation/FileCopy.py "C:/ClonedProject/{{ netcodeProject[1].projectPath }}"
6060

6161
# Build the project using Unity Editor. This will call the given static BuilderScripts method.
6262
# Ideally, it would be nice to parametrize the BuilderScripts (for example to pass scripting backend as parameter) but -executeMethod only calls static methods without parameters so for now we will have multiple configurations

.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.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: 22 additions & 188 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ all_preview_apv_jobs:
88
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_macos
99
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_ubuntu
1010
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_windows
11-
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_1_-_macos
12-
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_1_-_ubuntu
13-
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_1_-_windows
1411
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_macos
1512
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_ubuntu
1613
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_windows
@@ -19,7 +16,7 @@ all_preview_apv_jobs:
1916
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_windows
2017
metadata:
2118
Job Maintainers: '#rm-packageworks'
22-
Wrench: 0.12.2.0
19+
Wrench: 1.0.0.0
2320

2421
# Functional tests for dependents found in the latest 6000.0 manifest (MacOS).
2522
preview_apv_-_6000_0_-_macos:
@@ -70,16 +67,16 @@ preview_apv_-_6000_0_-_macos:
7067
dependencies:
7168
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
7269
variables:
73-
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
70+
UPMPVP_CONTEXT_WRENCH: 1.0.0.0
7471
metadata:
7572
Job Maintainers: '#rm-packageworks'
76-
Wrench: 0.12.2.0
73+
Wrench: 1.0.0.0
7774

7875
# Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu).
7976
preview_apv_-_6000_0_-_ubuntu:
8077
name: Preview APV - 6000.0 - ubuntu
8178
agent:
82-
image: package-ci/ubuntu-20.04:default
79+
image: package-ci/ubuntu-22.04:v4
8380
type: Unity::VM
8481
flavor: b1.large
8582
commands:
@@ -124,10 +121,10 @@ preview_apv_-_6000_0_-_ubuntu:
124121
dependencies:
125122
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
126123
variables:
127-
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
124+
UPMPVP_CONTEXT_WRENCH: 1.0.0.0
128125
metadata:
129126
Job Maintainers: '#rm-packageworks'
130-
Wrench: 0.12.2.0
127+
Wrench: 1.0.0.0
131128

132129
# Functional tests for dependents found in the latest 6000.0 manifest (Windows).
133130
preview_apv_-_6000_0_-_windows:
@@ -179,173 +176,10 @@ preview_apv_-_6000_0_-_windows:
179176
dependencies:
180177
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
181178
variables:
182-
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
179+
UPMPVP_CONTEXT_WRENCH: 1.0.0.0
183180
metadata:
184181
Job Maintainers: '#rm-packageworks'
185-
Wrench: 0.12.2.0
186-
187-
# Functional tests for dependents found in the latest 6000.1 manifest (MacOS).
188-
preview_apv_-_6000_1_-_macos:
189-
name: Preview APV - 6000.1 - macos
190-
agent:
191-
image: package-ci/macos-13:default
192-
type: Unity::VM::osx
193-
flavor: b1.xlarge
194-
commands:
195-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
196-
- command: 7z x -aoa wrench-localapv.zip
197-
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
198-
- command: python PythonScripts/print_machine_info.py
199-
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
200-
timeout: 20
201-
retries: 10
202-
- command: unity-downloader-cli -u 6000.1/staging -c editor --path .Editor --fast
203-
timeout: 10
204-
retries: 3
205-
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.1 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
206-
- command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
207-
after:
208-
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
209-
artifacts:
210-
Crash Dumps:
211-
paths:
212-
- CrashDumps/**
213-
logs:
214-
paths:
215-
- '*.log'
216-
- '*.xml'
217-
- upm-ci~/test-results/**/*
218-
- upm-ci~/temp/*/Logs/**
219-
- upm-ci~/temp/*/Library/*.log
220-
- upm-ci~/temp/*/*.log
221-
- upm-ci~/temp/Builds/*.log
222-
packages:
223-
paths:
224-
- upm-ci~/packages/**/*
225-
PreviewAPVResults:
226-
paths:
227-
- PreviewApvArtifacts~/**
228-
- APVTest/**/manifest.json
229-
pvp-results:
230-
paths:
231-
- upm-ci~/pvp/**/*
232-
browsable: onDemand
233-
dependencies:
234-
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
235-
variables:
236-
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
237-
metadata:
238-
Job Maintainers: '#rm-packageworks'
239-
Wrench: 0.12.2.0
240-
241-
# Functional tests for dependents found in the latest 6000.1 manifest (Ubuntu).
242-
preview_apv_-_6000_1_-_ubuntu:
243-
name: Preview APV - 6000.1 - ubuntu
244-
agent:
245-
image: package-ci/ubuntu-20.04:default
246-
type: Unity::VM
247-
flavor: b1.large
248-
commands:
249-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
250-
- command: 7z x -aoa wrench-localapv.zip
251-
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
252-
- command: python PythonScripts/print_machine_info.py
253-
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
254-
timeout: 20
255-
retries: 10
256-
- command: unity-downloader-cli -u 6000.1/staging -c editor --path .Editor --fast
257-
timeout: 10
258-
retries: 3
259-
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.1 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
260-
- command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
261-
after:
262-
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
263-
artifacts:
264-
Crash Dumps:
265-
paths:
266-
- CrashDumps/**
267-
logs:
268-
paths:
269-
- '*.log'
270-
- '*.xml'
271-
- upm-ci~/test-results/**/*
272-
- upm-ci~/temp/*/Logs/**
273-
- upm-ci~/temp/*/Library/*.log
274-
- upm-ci~/temp/*/*.log
275-
- upm-ci~/temp/Builds/*.log
276-
packages:
277-
paths:
278-
- upm-ci~/packages/**/*
279-
PreviewAPVResults:
280-
paths:
281-
- PreviewApvArtifacts~/**
282-
- APVTest/**/manifest.json
283-
pvp-results:
284-
paths:
285-
- upm-ci~/pvp/**/*
286-
browsable: onDemand
287-
dependencies:
288-
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
289-
variables:
290-
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
291-
metadata:
292-
Job Maintainers: '#rm-packageworks'
293-
Wrench: 0.12.2.0
294-
295-
# Functional tests for dependents found in the latest 6000.1 manifest (Windows).
296-
preview_apv_-_6000_1_-_windows:
297-
name: Preview APV - 6000.1 - windows
298-
agent:
299-
image: package-ci/win10:default
300-
type: Unity::VM
301-
flavor: b1.large
302-
commands:
303-
- command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f
304-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
305-
- command: 7z x -aoa wrench-localapv.zip
306-
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
307-
- command: python PythonScripts/print_machine_info.py
308-
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
309-
timeout: 20
310-
retries: 10
311-
- command: unity-downloader-cli -u 6000.1/staging -c editor --path .Editor --fast
312-
timeout: 10
313-
retries: 3
314-
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.1 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
315-
- command: python PythonScripts/editor_manifest_validator.py --version=6000.1 --wrench-config=.yamato/wrench/wrench_config.json
316-
after:
317-
- command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
318-
artifacts:
319-
Crash Dumps:
320-
paths:
321-
- CrashDumps/**
322-
logs:
323-
paths:
324-
- '*.log'
325-
- '*.xml'
326-
- upm-ci~/test-results/**/*
327-
- upm-ci~/temp/*/Logs/**
328-
- upm-ci~/temp/*/Library/*.log
329-
- upm-ci~/temp/*/*.log
330-
- upm-ci~/temp/Builds/*.log
331-
packages:
332-
paths:
333-
- upm-ci~/packages/**/*
334-
PreviewAPVResults:
335-
paths:
336-
- PreviewApvArtifacts~/**
337-
- APVTest/**/manifest.json
338-
pvp-results:
339-
paths:
340-
- upm-ci~/pvp/**/*
341-
browsable: onDemand
342-
dependencies:
343-
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
344-
variables:
345-
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
346-
metadata:
347-
Job Maintainers: '#rm-packageworks'
348-
Wrench: 0.12.2.0
182+
Wrench: 1.0.0.0
349183

350184
# Functional tests for dependents found in the latest 6000.2 manifest (MacOS).
351185
preview_apv_-_6000_2_-_macos:
@@ -396,16 +230,16 @@ preview_apv_-_6000_2_-_macos:
396230
dependencies:
397231
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
398232
variables:
399-
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
233+
UPMPVP_CONTEXT_WRENCH: 1.0.0.0
400234
metadata:
401235
Job Maintainers: '#rm-packageworks'
402-
Wrench: 0.12.2.0
236+
Wrench: 1.0.0.0
403237

404238
# Functional tests for dependents found in the latest 6000.2 manifest (Ubuntu).
405239
preview_apv_-_6000_2_-_ubuntu:
406240
name: Preview APV - 6000.2 - ubuntu
407241
agent:
408-
image: package-ci/ubuntu-20.04:default
242+
image: package-ci/ubuntu-22.04:v4
409243
type: Unity::VM
410244
flavor: b1.large
411245
commands:
@@ -450,10 +284,10 @@ preview_apv_-_6000_2_-_ubuntu:
450284
dependencies:
451285
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
452286
variables:
453-
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
287+
UPMPVP_CONTEXT_WRENCH: 1.0.0.0
454288
metadata:
455289
Job Maintainers: '#rm-packageworks'
456-
Wrench: 0.12.2.0
290+
Wrench: 1.0.0.0
457291

458292
# Functional tests for dependents found in the latest 6000.2 manifest (Windows).
459293
preview_apv_-_6000_2_-_windows:
@@ -505,10 +339,10 @@ preview_apv_-_6000_2_-_windows:
505339
dependencies:
506340
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
507341
variables:
508-
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
342+
UPMPVP_CONTEXT_WRENCH: 1.0.0.0
509343
metadata:
510344
Job Maintainers: '#rm-packageworks'
511-
Wrench: 0.12.2.0
345+
Wrench: 1.0.0.0
512346

513347
# Functional tests for dependents found in the latest 6000.3 manifest (MacOS).
514348
preview_apv_-_6000_3_-_macos:
@@ -559,16 +393,16 @@ preview_apv_-_6000_3_-_macos:
559393
dependencies:
560394
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
561395
variables:
562-
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
396+
UPMPVP_CONTEXT_WRENCH: 1.0.0.0
563397
metadata:
564398
Job Maintainers: '#rm-packageworks'
565-
Wrench: 0.12.2.0
399+
Wrench: 1.0.0.0
566400

567401
# Functional tests for dependents found in the latest 6000.3 manifest (Ubuntu).
568402
preview_apv_-_6000_3_-_ubuntu:
569403
name: Preview APV - 6000.3 - ubuntu
570404
agent:
571-
image: package-ci/ubuntu-20.04:default
405+
image: package-ci/ubuntu-22.04:v4
572406
type: Unity::VM
573407
flavor: b1.large
574408
commands:
@@ -613,10 +447,10 @@ preview_apv_-_6000_3_-_ubuntu:
613447
dependencies:
614448
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
615449
variables:
616-
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
450+
UPMPVP_CONTEXT_WRENCH: 1.0.0.0
617451
metadata:
618452
Job Maintainers: '#rm-packageworks'
619-
Wrench: 0.12.2.0
453+
Wrench: 1.0.0.0
620454

621455
# Functional tests for dependents found in the latest 6000.3 manifest (Windows).
622456
preview_apv_-_6000_3_-_windows:
@@ -668,8 +502,8 @@ preview_apv_-_6000_3_-_windows:
668502
dependencies:
669503
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
670504
variables:
671-
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
505+
UPMPVP_CONTEXT_WRENCH: 1.0.0.0
672506
metadata:
673507
Job Maintainers: '#rm-packageworks'
674-
Wrench: 0.12.2.0
508+
Wrench: 1.0.0.0
675509

0 commit comments

Comments
 (0)