Skip to content

Commit 36a2bc2

Browse files
michalChrobotmichalChrobot
committed
chore: Added Ci related folders to gitignore and updated Wrench (#3281)
* Updated Gitignore files * Updated Wrench version as well as TargetFramework from net7.0 to net8.0 * Regenerated wrench recipes
1 parent cd6fd5b commit 36a2bc2

File tree

7 files changed

+78
-28
lines changed

7 files changed

+78
-28
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@ upm-ci~
99
utr
1010
utr.bat
1111
.download
12+
Tools/CI/bin
13+
Tools/CI/obj
1214

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Auto-generated by Recipe Engine, do not modify manually.
2-
# This job is generated by the wrench recipe engine module.
2+
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
33

44
# upm-ci validation tests for API Validation - netcode.gameobjects - 6000.0 - windows (6000.0 - Windows).
55
api_validation_-_netcode_gameobjects_-_6000_0_-_windows:
@@ -9,7 +9,7 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_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-54_4ed3929f39f0279ecefec81a437d0eb42e21a4f9c6469a88d31e8f3d764709fe.zip -o wrench-localapv.zip
12+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.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
@@ -30,7 +30,7 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_windows:
3030
retries: 0
3131
after:
3232
- command: cmd.exe /c "curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.bat --output run_standalone_instability_detection-latest.bat --retry 5 || exit 0"
33-
- command: cmd.exe /c "run_standalone_instability_detection-latest.bat 0.5.0 || exit 0"
33+
- command: cmd.exe /c "run_standalone_instability_detection-latest.bat 0.5.1 || exit 0"
3434
timeout: 10
3535
retries: 1
3636
artifacts:
@@ -50,11 +50,11 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_windows:
5050
dependencies:
5151
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
5252
variables:
53-
UPMPVP_CONTEXT_WRENCH: 0.10.31.0
53+
UPMPVP_CONTEXT_WRENCH: 0.10.36.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.31.0
59+
Wrench: 0.10.36.0
6060

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Auto-generated by Recipe Engine, do not modify manually.
2-
# This job is generated by the wrench recipe engine module.
2+
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
33

4-
# Pack and Sign Netcode for GameObjects
4+
# Pack Netcode for GameObjects
55
package_pack_-_netcode_gameobjects:
66
name: Package Pack - netcode.gameobjects
77
agent:
@@ -12,15 +12,15 @@ 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-54_4ed3929f39f0279ecefec81a437d0eb42e21a4f9c6469a88d31e8f3d764709fe.zip -o wrench-localapv.zip
15+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.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
1919
- command: upm-ci package pack --package-path com.unity.netcode.gameobjects
2020
- command: cp upm-ci~/packages/packages.json upm-ci~/packages/com.unity.netcode.gameobjects_packages.json
2121
after:
2222
- command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
23-
- command: bash ./run_standalone_instability_detection-latest.sh ubuntu 0.5.0 || exit 0
23+
- command: bash ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
2424
timeout: 10
2525
retries: 1
2626
artifacts:
@@ -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.31.0
32+
UPMPVP_CONTEXT_WRENCH: 0.10.36.0
3333
metadata:
3434
Job Maintainers: '#rm-packageworks'
35-
Wrench: 0.10.31.0
35+
Wrench: 0.10.36.0
3636

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

Lines changed: 57 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Auto-generated by Recipe Engine, do not modify manually.
2-
# This job is generated by the wrench recipe engine module.
2+
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
33

44
# Publish Dry Run for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
55
publish_dry_run_netcode_gameobjects:
@@ -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-54_4ed3929f39f0279ecefec81a437d0eb42e21a4f9c6469a88d31e8f3d764709fe.zip -o wrench-localapv.zip
12+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.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
@@ -19,7 +19,7 @@ publish_dry_run_netcode_gameobjects:
1919
- command: python PythonScripts/run_publish_if_any_package_left.py --dry-run
2020
after:
2121
- command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
22-
- command: bash ./run_standalone_instability_detection-latest.sh ubuntu 0.5.0 || exit 0
22+
- command: bash ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
2323
timeout: 10
2424
retries: 1
2525
artifacts:
@@ -77,15 +77,39 @@ publish_dry_run_netcode_gameobjects:
7777
pvp-results:
7878
location: results/pvp/validate-netcode.gameobjects-6000.1-windows
7979
unzip: true
80+
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_2_-_macos
81+
specific_options:
82+
UTR:
83+
location: results/UTR/validate-netcode.gameobjects-6000.2-macos
84+
unzip: true
85+
pvp-results:
86+
location: results/pvp/validate-netcode.gameobjects-6000.2-macos
87+
unzip: true
88+
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_2_-_ubuntu
89+
specific_options:
90+
UTR:
91+
location: results/UTR/validate-netcode.gameobjects-6000.2-ubuntu
92+
unzip: true
93+
pvp-results:
94+
location: results/pvp/validate-netcode.gameobjects-6000.2-ubuntu
95+
unzip: true
96+
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_2_-_windows
97+
specific_options:
98+
UTR:
99+
location: results/UTR/validate-netcode.gameobjects-6000.2-windows
100+
unzip: true
101+
pvp-results:
102+
location: results/pvp/validate-netcode.gameobjects-6000.2-windows
103+
unzip: true
80104
variables:
81105
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
82-
UPMPVP_CONTEXT_WRENCH: 0.10.31.0
106+
UPMPVP_CONTEXT_WRENCH: 0.10.36.0
83107
triggers:
84108
expression: push.branch match "^release/.*"
85109
cancel_old_ci: true
86110
metadata:
87111
Job Maintainers: '#rm-packageworks'
88-
Wrench: 0.10.31.0
112+
Wrench: 0.10.36.0
89113

90114
# Publish for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
91115
publish_netcode_gameobjects:
@@ -95,7 +119,7 @@ publish_netcode_gameobjects:
95119
type: Unity::VM
96120
flavor: b1.large
97121
commands:
98-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-54_4ed3929f39f0279ecefec81a437d0eb42e21a4f9c6469a88d31e8f3d764709fe.zip -o wrench-localapv.zip
122+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
99123
- command: 7z x -aoa wrench-localapv.zip
100124
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
101125
- command: python PythonScripts/print_machine_info.py
@@ -105,7 +129,7 @@ publish_netcode_gameobjects:
105129
- command: python PythonScripts/run_publish_if_any_package_left.py
106130
after:
107131
- command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
108-
- command: bash ./run_standalone_instability_detection-latest.sh ubuntu 0.5.0 || exit 0
132+
- command: bash ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
109133
timeout: 10
110134
retries: 1
111135
artifacts:
@@ -163,10 +187,34 @@ publish_netcode_gameobjects:
163187
pvp-results:
164188
location: results/pvp/validate-netcode.gameobjects-6000.1-windows
165189
unzip: true
190+
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_2_-_macos
191+
specific_options:
192+
UTR:
193+
location: results/UTR/validate-netcode.gameobjects-6000.2-macos
194+
unzip: true
195+
pvp-results:
196+
location: results/pvp/validate-netcode.gameobjects-6000.2-macos
197+
unzip: true
198+
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_2_-_ubuntu
199+
specific_options:
200+
UTR:
201+
location: results/UTR/validate-netcode.gameobjects-6000.2-ubuntu
202+
unzip: true
203+
pvp-results:
204+
location: results/pvp/validate-netcode.gameobjects-6000.2-ubuntu
205+
unzip: true
206+
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_2_-_windows
207+
specific_options:
208+
UTR:
209+
location: results/UTR/validate-netcode.gameobjects-6000.2-windows
210+
unzip: true
211+
pvp-results:
212+
location: results/pvp/validate-netcode.gameobjects-6000.2-windows
213+
unzip: true
166214
variables:
167215
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
168-
UPMPVP_CONTEXT_WRENCH: 0.10.31.0
216+
UPMPVP_CONTEXT_WRENCH: 0.10.36.0
169217
metadata:
170218
Job Maintainers: '#rm-packageworks'
171-
Wrench: 0.10.31.0
219+
Wrench: 0.10.36.0
172220

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Auto-generated by Recipe Engine, do not modify manually.
2-
# This job is generated by the wrench recipe engine module.
2+
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
33

44
# Test that Generated Wrench Jobs are up to date.
55
test_-_wrench_jobs_up_to_date:
@@ -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)" ]; 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.10.31.0
29+
Wrench: 0.10.36.0
3030

‎.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.10.31.0",
34+
"wrench_version": "0.10.36.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
}

‎Tools/CI/NGO.Cookbook.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="RecipeEngine.Modules.Wrench" Version="0.10.31" />
11+
<PackageReference Include="RecipeEngine.Modules.Wrench" Version="0.10.36" />
1212
</ItemGroup>
1313

1414
</Project>

0 commit comments

Comments
 (0)