Skip to content

Commit b40e2b9

Browse files
michalChrobotmichalChrobot
authored
PVP and Wrench fixes
* Updated wrench version to 0.10.30 * Corrected license file * Removed old files not conforming to pvp rules * Corrected typo in changelog * Added samples description to package.json while removing deprecated .samples.json * Inclusion of CI generation files
1 parent b183381 commit b40e2b9

21 files changed

+252
-115
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ api_validation_-_netcode_gameobjects_-_2021_3_-_windows:
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-46_5989adaa2e1fb763637fce73dc8dd932ee311a074f584a98fbd9fd05eb2b6f31.zip -o wrench-localapv.zip
12+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-54_4ed3929f39f0279ecefec81a437d0eb42e21a4f9c6469a88d31e8f3d764709fe.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
@@ -50,11 +50,11 @@ api_validation_-_netcode_gameobjects_-_2021_3_-_windows:
5050
dependencies:
5151
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
5252
variables:
53-
UPMPVP_CONTEXT_WRENCH: 0.10.25.0
53+
UPMPVP_CONTEXT_WRENCH: 0.10.31.0
5454
triggers:
5555
expression: push.branch match "^release/.*"
5656
cancel_old_ci: true
5757
metadata:
5858
Job Maintainers: '#rm-packageworks'
59-
Wrench: 0.10.25.0
59+
Wrench: 0.10.31.0
6060

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ package_pack_-_netcode_gameobjects:
1212
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
1313
timeout: 20
1414
retries: 10
15-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-46_5989adaa2e1fb763637fce73dc8dd932ee311a074f584a98fbd9fd05eb2b6f31.zip -o wrench-localapv.zip
15+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-54_4ed3929f39f0279ecefec81a437d0eb42e21a4f9c6469a88d31e8f3d764709fe.zip -o wrench-localapv.zip
1616
- command: 7z x -aoa wrench-localapv.zip
1717
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
1818
- command: python PythonScripts/print_machine_info.py
@@ -29,8 +29,8 @@ package_pack_-_netcode_gameobjects:
2929
- upm-ci~/packages/**/*
3030
variables:
3131
UPMCI_ACK_LARGE_PACKAGE: 1
32-
UPMPVP_CONTEXT_WRENCH: 0.10.25.0
32+
UPMPVP_CONTEXT_WRENCH: 0.10.31.0
3333
metadata:
3434
Job Maintainers: '#rm-packageworks'
35-
Wrench: 0.10.25.0
35+
Wrench: 0.10.31.0
3636

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

Lines changed: 57 additions & 37 deletions
Large diffs are not rendered by default.

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# Auto-generated by Recipe Engine, do not modify manually.
22
# This job is generated by the wrench recipe engine module.
33

4-
# Publish Dry Run for netcode.gameobjects
4+
# Publish Dry Run for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
55
publish_dry_run_netcode_gameobjects:
66
name: Publish Dry Run netcode.gameobjects
77
agent:
88
image: package-ci/ubuntu-20.04:default
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-46_5989adaa2e1fb763637fce73dc8dd932ee311a074f584a98fbd9fd05eb2b6f31.zip -o wrench-localapv.zip
12+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-54_4ed3929f39f0279ecefec81a437d0eb42e21a4f9c6469a88d31e8f3d764709fe.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
@@ -127,23 +127,23 @@ publish_dry_run_netcode_gameobjects:
127127
unzip: true
128128
variables:
129129
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
130-
UPMPVP_CONTEXT_WRENCH: 0.10.25.0
130+
UPMPVP_CONTEXT_WRENCH: 0.10.31.0
131131
triggers:
132132
expression: push.branch match "^release/.*"
133133
cancel_old_ci: true
134134
metadata:
135135
Job Maintainers: '#rm-packageworks'
136-
Wrench: 0.10.25.0
136+
Wrench: 0.10.31.0
137137

138-
# Publish for netcode.gameobjects
138+
# Publish for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
139139
publish_netcode_gameobjects:
140140
name: Publish netcode.gameobjects
141141
agent:
142142
image: package-ci/ubuntu-20.04:default
143143
type: Unity::VM
144144
flavor: b1.large
145145
commands:
146-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-46_5989adaa2e1fb763637fce73dc8dd932ee311a074f584a98fbd9fd05eb2b6f31.zip -o wrench-localapv.zip
146+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-54_4ed3929f39f0279ecefec81a437d0eb42e21a4f9c6469a88d31e8f3d764709fe.zip -o wrench-localapv.zip
147147
- command: 7z x -aoa wrench-localapv.zip
148148
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
149149
- command: python PythonScripts/print_machine_info.py
@@ -261,8 +261,8 @@ publish_netcode_gameobjects:
261261
unzip: true
262262
variables:
263263
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
264-
UPMPVP_CONTEXT_WRENCH: 0.10.25.0
264+
UPMPVP_CONTEXT_WRENCH: 0.10.31.0
265265
metadata:
266266
Job Maintainers: '#rm-packageworks'
267-
Wrench: 0.10.25.0
267+
Wrench: 0.10.31.0
268268

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Auto-generated by Recipe Engine, do not modify manually.
2+
# This job is generated by the wrench recipe engine module.
3+
4+
# Test that Generated Wrench Jobs are up to date.
5+
test_-_wrench_jobs_up_to_date:
6+
name: Test - Wrench Jobs up to date
7+
agent:
8+
image: package-ci/ubuntu-20.04:default
9+
type: Unity::VM
10+
flavor: b1.large
11+
commands:
12+
- command: dotnet run --project Tools\CI\NGO.Cookbook.csproj
13+
- command: |-
14+
if [ -n "$(git status --porcelain)" ]; then
15+
git status
16+
echo "Your repo is not clean - diff output:"
17+
git diff
18+
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."
20+
exit 1
21+
fi
22+
variables:
23+
DOTNET_CLI_TELEMETRY_OPTOUT: 1
24+
triggers:
25+
expression: push.branch match "^release/.*"
26+
cancel_old_ci: true
27+
metadata:
28+
Job Maintainers: '#rm-packageworks'
29+
Wrench: 0.10.31.0
30+

0 commit comments

Comments
 (0)