Skip to content

Commit fee74d0

Browse files
NoelStephensUnityNoelStephensUnity
authored
Merge branch 'develop-2.0.0' into fix/anticipatednetworkvariable-not-updating-previousvalue
2 parents 92e027a + 84c06c7 commit fee74d0

37 files changed

+402
-160
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Conventional PR
22

3-
# Controls when the action will run.
3+
# Controls when the action will run.
44
on:
55
pull_request:
66
branches:
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- name: semantic-pull-request
2020
# 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
21-
uses: amannn/action-semantic-pull-request@40166f00814508ec3201fc8595b393d451c8cd80
21+
uses: amannn/action-semantic-pull-request@v5
2222
env:
2323
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2424
with:
@@ -35,4 +35,4 @@ jobs:
3535
# For work-in-progress PRs you can typically use draft pull requests from Github. However, private repositories on the free plan don't have this option and therefore this action allows you to opt-in to using the special '[WIP]' prefix to indicate this state. This will avoid the validation of the PR title and the pull request checks remain pending. Note that a second check will be reported if this is enabled.
3636
#wip: # optional
3737
# When using "Squash and merge" on a PR with only one commit, GitHub will suggest using that commit message instead of the PR title for the merge commit, and it's easy to commit this by mistake. Enable this option to also validate the commit message for one commit PRs.
38-
validateSingleCommit: true # optional
38+
# validateSingleCommit: true # optional

‎.yamato/code-coverage.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@ code_coverage_{{ platform.name }}_{{ editor }}:
1616
commands:
1717
- npm install -g upm-ci-utils@stable --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
1818
- unity-downloader-cli -u {{ editor }} -c Editor --fast --wait
19-
- {% if platform.name == "ubuntu" %}DISPLAY=:0 {% endif %} upm-ci package test -u {{ editor }} --package-path com.unity.netcode.gameobjects --enable-code-coverage --code-coverage-options 'generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.Netcode.Editor,+Unity.Netcode.Runtime' --extra-utr-arg="--extra-editor-arg=--burst-disable-compilation --extra-editor-arg=-testCategory --extra-editor-arg=!Performance --timeout=1800 --reruncount=1 --clean-library-on-rerun"
19+
- DISPLAY=:0 upm-ci package test -u {{ editor }} --package-path com.unity.netcode.gameobjects --enable-code-coverage --code-coverage-options 'generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.Netcode.Editor,+Unity.Netcode.Runtime' --extra-utr-arg="--extra-editor-arg=--burst-disable-compilation --extra-editor-arg=testCategory --extra-editor-arg=!Performance --timeout=1800 --reruncount=1 --clean-library-on-rerun"
2020
artifacts:
2121
logs:
2222
paths:
2323
- "upm-ci~/test-results/**/*"
24+
- "upm-ci~/test-results/CoverageResults/**/*"
2425
dependencies:
25-
- .yamato/package-pack.yml#package_pack_-_ngo_{{ platform.name }}
26+
- .yamato/package-pack.yml#package_pack_-_ngo_{{ platform.name }}_upmCI
2627
{% endfor -%}
2728
{% endfor -%}

‎.yamato/package-pack.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,28 @@ package_pack_-_ngo_{{ platform.name }}:
2525
packages:
2626
paths:
2727
- "upm-ci~/**"
28+
{% endfor -%}
29+
30+
31+
# This is in essence the same job as the one above with the difference that upm-ci is used instead of upm-pvp
32+
# The reason for using it is that I had some problems with Code Coverage which in its current form uses upm-ci but if we would use the other pack job (the one above) we would need to use upm-pvp
33+
# I had some problems with getting it to work so as temporary solution I created this pack job which is used ONLY as a dependency of Code Coverage job (other jobs use the above definition of pack job)
34+
# TODO: remove this job and utilize the above one for Code Coverage job. This is tracked in MTT-11383
35+
{% for platform in test_platforms.default -%}
36+
{% for project in projects.default -%}
37+
package_pack_-_ngo_{{ platform.name }}_upmCI:
38+
name: Package Pack (legacy upm-ci) - NGO [{{ platform.name }}]
39+
agent:
40+
type: {{ platform.type }}
41+
image: {{ platform.image }}
42+
flavor: {{ platform.flavor }}
43+
timeout: 0.25
44+
commands:
45+
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
46+
- upm-ci project pack --project-path {{ project.path }}
47+
artifacts:
48+
packages:
49+
paths:
50+
- "upm-ci~/packages/**/*"
51+
{% endfor -%}
2852
{% endfor -%}

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Auto-generated by Recipe Engine, do not modify manually.
22
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
3+
all_api_validation_jobs:
4+
name: All API Validation Jobs
5+
dependencies:
6+
- path: .yamato/wrench/api-validation-jobs.yml#api_validation_-_netcode_gameobjects_-_6000_0_-_windows
37

48
# upm-ci validation tests for API Validation - netcode.gameobjects - 6000.0 - windows (6000.0 - Windows).
59
api_validation_-_netcode_gameobjects_-_6000_0_-_windows:
@@ -9,7 +13,7 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_windows:
913
type: Unity::VM
1014
flavor: b1.large
1115
commands:
12-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
16+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-58_ab06748e39f9b01f55b979c0c06d7c1f787e07cbca4dc6ae5eef274fd195612a.zip -o wrench-localapv.zip
1317
- command: 7z x -aoa wrench-localapv.zip
1418
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
1519
- command: python PythonScripts/print_machine_info.py
@@ -47,11 +51,8 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_windows:
4751
dependencies:
4852
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
4953
variables:
50-
UPMPVP_CONTEXT_WRENCH: 0.10.37.0
51-
triggers:
52-
expression: push.branch match "^release/.*"
53-
cancel_old_ci: true
54+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
5455
metadata:
5556
Job Maintainers: '#rm-packageworks'
56-
Wrench: 0.10.37.0
57+
Wrench: 0.10.40.0
5758

‎.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.10.37.0
27+
Wrench: 0.10.40.0
2828

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

Lines changed: 28 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,9 @@ all_preview_apv_jobs:
1414
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_macos
1515
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_ubuntu
1616
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_windows
17-
triggers:
18-
expression: push.branch match "^release/.*"
19-
cancel_old_ci: true
2017
metadata:
2118
Job Maintainers: '#rm-packageworks'
22-
Wrench: 0.10.37.0
19+
Wrench: 0.10.40.0
2320

2421
# Functional tests for dependents found in the latest 6000.0 manifest (MacOS).
2522
preview_apv_-_6000_0_-_macos:
@@ -29,7 +26,7 @@ preview_apv_-_6000_0_-_macos:
2926
type: Unity::VM::osx
3027
flavor: b1.xlarge
3128
commands:
32-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
29+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-58_ab06748e39f9b01f55b979c0c06d7c1f787e07cbca4dc6ae5eef274fd195612a.zip -o wrench-localapv.zip
3330
- command: 7z x -aoa wrench-localapv.zip
3431
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
3532
- command: python PythonScripts/print_machine_info.py
@@ -70,10 +67,10 @@ 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.10.37.0
70+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
7471
metadata:
7572
Job Maintainers: '#rm-packageworks'
76-
Wrench: 0.10.37.0
73+
Wrench: 0.10.40.0
7774

7875
# Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu).
7976
preview_apv_-_6000_0_-_ubuntu:
@@ -83,7 +80,7 @@ preview_apv_-_6000_0_-_ubuntu:
8380
type: Unity::VM
8481
flavor: b1.large
8582
commands:
86-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
83+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-58_ab06748e39f9b01f55b979c0c06d7c1f787e07cbca4dc6ae5eef274fd195612a.zip -o wrench-localapv.zip
8784
- command: 7z x -aoa wrench-localapv.zip
8885
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
8986
- command: python PythonScripts/print_machine_info.py
@@ -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.10.37.0
124+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
128125
metadata:
129126
Job Maintainers: '#rm-packageworks'
130-
Wrench: 0.10.37.0
127+
Wrench: 0.10.40.0
131128

132129
# Functional tests for dependents found in the latest 6000.0 manifest (Windows).
133130
preview_apv_-_6000_0_-_windows:
@@ -138,7 +135,7 @@ preview_apv_-_6000_0_-_windows:
138135
flavor: b1.large
139136
commands:
140137
- command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f
141-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
138+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-58_ab06748e39f9b01f55b979c0c06d7c1f787e07cbca4dc6ae5eef274fd195612a.zip -o wrench-localapv.zip
142139
- command: 7z x -aoa wrench-localapv.zip
143140
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
144141
- command: python PythonScripts/print_machine_info.py
@@ -179,10 +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.10.37.0
179+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
183180
metadata:
184181
Job Maintainers: '#rm-packageworks'
185-
Wrench: 0.10.37.0
182+
Wrench: 0.10.40.0
186183

187184
# Functional tests for dependents found in the latest 6000.1 manifest (MacOS).
188185
preview_apv_-_6000_1_-_macos:
@@ -192,7 +189,7 @@ preview_apv_-_6000_1_-_macos:
192189
type: Unity::VM::osx
193190
flavor: b1.xlarge
194191
commands:
195-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
192+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-58_ab06748e39f9b01f55b979c0c06d7c1f787e07cbca4dc6ae5eef274fd195612a.zip -o wrench-localapv.zip
196193
- command: 7z x -aoa wrench-localapv.zip
197194
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
198195
- command: python PythonScripts/print_machine_info.py
@@ -233,10 +230,10 @@ preview_apv_-_6000_1_-_macos:
233230
dependencies:
234231
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
235232
variables:
236-
UPMPVP_CONTEXT_WRENCH: 0.10.37.0
233+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
237234
metadata:
238235
Job Maintainers: '#rm-packageworks'
239-
Wrench: 0.10.37.0
236+
Wrench: 0.10.40.0
240237

241238
# Functional tests for dependents found in the latest 6000.1 manifest (Ubuntu).
242239
preview_apv_-_6000_1_-_ubuntu:
@@ -246,7 +243,7 @@ preview_apv_-_6000_1_-_ubuntu:
246243
type: Unity::VM
247244
flavor: b1.large
248245
commands:
249-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
246+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-58_ab06748e39f9b01f55b979c0c06d7c1f787e07cbca4dc6ae5eef274fd195612a.zip -o wrench-localapv.zip
250247
- command: 7z x -aoa wrench-localapv.zip
251248
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
252249
- command: python PythonScripts/print_machine_info.py
@@ -287,10 +284,10 @@ preview_apv_-_6000_1_-_ubuntu:
287284
dependencies:
288285
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
289286
variables:
290-
UPMPVP_CONTEXT_WRENCH: 0.10.37.0
287+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
291288
metadata:
292289
Job Maintainers: '#rm-packageworks'
293-
Wrench: 0.10.37.0
290+
Wrench: 0.10.40.0
294291

295292
# Functional tests for dependents found in the latest 6000.1 manifest (Windows).
296293
preview_apv_-_6000_1_-_windows:
@@ -301,7 +298,7 @@ preview_apv_-_6000_1_-_windows:
301298
flavor: b1.large
302299
commands:
303300
- 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-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
301+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-58_ab06748e39f9b01f55b979c0c06d7c1f787e07cbca4dc6ae5eef274fd195612a.zip -o wrench-localapv.zip
305302
- command: 7z x -aoa wrench-localapv.zip
306303
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
307304
- command: python PythonScripts/print_machine_info.py
@@ -342,10 +339,10 @@ preview_apv_-_6000_1_-_windows:
342339
dependencies:
343340
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
344341
variables:
345-
UPMPVP_CONTEXT_WRENCH: 0.10.37.0
342+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
346343
metadata:
347344
Job Maintainers: '#rm-packageworks'
348-
Wrench: 0.10.37.0
345+
Wrench: 0.10.40.0
349346

350347
# Functional tests for dependents found in the latest 6000.2 manifest (MacOS).
351348
preview_apv_-_6000_2_-_macos:
@@ -355,7 +352,7 @@ preview_apv_-_6000_2_-_macos:
355352
type: Unity::VM::osx
356353
flavor: b1.xlarge
357354
commands:
358-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
355+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-58_ab06748e39f9b01f55b979c0c06d7c1f787e07cbca4dc6ae5eef274fd195612a.zip -o wrench-localapv.zip
359356
- command: 7z x -aoa wrench-localapv.zip
360357
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
361358
- command: python PythonScripts/print_machine_info.py
@@ -396,10 +393,10 @@ preview_apv_-_6000_2_-_macos:
396393
dependencies:
397394
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
398395
variables:
399-
UPMPVP_CONTEXT_WRENCH: 0.10.37.0
396+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
400397
metadata:
401398
Job Maintainers: '#rm-packageworks'
402-
Wrench: 0.10.37.0
399+
Wrench: 0.10.40.0
403400

404401
# Functional tests for dependents found in the latest 6000.2 manifest (Ubuntu).
405402
preview_apv_-_6000_2_-_ubuntu:
@@ -409,7 +406,7 @@ preview_apv_-_6000_2_-_ubuntu:
409406
type: Unity::VM
410407
flavor: b1.large
411408
commands:
412-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
409+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-58_ab06748e39f9b01f55b979c0c06d7c1f787e07cbca4dc6ae5eef274fd195612a.zip -o wrench-localapv.zip
413410
- command: 7z x -aoa wrench-localapv.zip
414411
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
415412
- command: python PythonScripts/print_machine_info.py
@@ -450,10 +447,10 @@ preview_apv_-_6000_2_-_ubuntu:
450447
dependencies:
451448
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
452449
variables:
453-
UPMPVP_CONTEXT_WRENCH: 0.10.37.0
450+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
454451
metadata:
455452
Job Maintainers: '#rm-packageworks'
456-
Wrench: 0.10.37.0
453+
Wrench: 0.10.40.0
457454

458455
# Functional tests for dependents found in the latest 6000.2 manifest (Windows).
459456
preview_apv_-_6000_2_-_windows:
@@ -464,7 +461,7 @@ preview_apv_-_6000_2_-_windows:
464461
flavor: b1.large
465462
commands:
466463
- command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f
467-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
464+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-58_ab06748e39f9b01f55b979c0c06d7c1f787e07cbca4dc6ae5eef274fd195612a.zip -o wrench-localapv.zip
468465
- command: 7z x -aoa wrench-localapv.zip
469466
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
470467
- command: python PythonScripts/print_machine_info.py
@@ -505,8 +502,8 @@ preview_apv_-_6000_2_-_windows:
505502
dependencies:
506503
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
507504
variables:
508-
UPMPVP_CONTEXT_WRENCH: 0.10.37.0
505+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
509506
metadata:
510507
Job Maintainers: '#rm-packageworks'
511-
Wrench: 0.10.37.0
508+
Wrench: 0.10.40.0
512509

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ publish_dry_run_netcode_gameobjects:
99
type: Unity::VM
1010
flavor: b1.large
1111
commands:
12-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
12+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-58_ab06748e39f9b01f55b979c0c06d7c1f787e07cbca4dc6ae5eef274fd195612a.zip -o wrench-localapv.zip
1313
- command: 7z x -aoa wrench-localapv.zip
1414
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
1515
- command: python PythonScripts/print_machine_info.py
@@ -100,13 +100,10 @@ publish_dry_run_netcode_gameobjects:
100100
unzip: true
101101
variables:
102102
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
103-
UPMPVP_CONTEXT_WRENCH: 0.10.37.0
104-
triggers:
105-
expression: push.branch match "^release/.*"
106-
cancel_old_ci: true
103+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
107104
metadata:
108105
Job Maintainers: '#rm-packageworks'
109-
Wrench: 0.10.37.0
106+
Wrench: 0.10.40.0
110107

111108
# Publish for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
112109
publish_netcode_gameobjects:
@@ -116,7 +113,7 @@ publish_netcode_gameobjects:
116113
type: Unity::VM
117114
flavor: b1.large
118115
commands:
119-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
116+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-58_ab06748e39f9b01f55b979c0c06d7c1f787e07cbca4dc6ae5eef274fd195612a.zip -o wrench-localapv.zip
120117
- command: 7z x -aoa wrench-localapv.zip
121118
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
122119
- command: python PythonScripts/print_machine_info.py
@@ -207,8 +204,8 @@ publish_netcode_gameobjects:
207204
unzip: true
208205
variables:
209206
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
210-
UPMPVP_CONTEXT_WRENCH: 0.10.37.0
207+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
211208
metadata:
212209
Job Maintainers: '#rm-packageworks'
213-
Wrench: 0.10.37.0
210+
Wrench: 0.10.40.0
214211

0 commit comments

Comments
 (0)