Skip to content

ci: [NGOv1.X]Updated Wrench and added project dependency #3513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .yamato/wrench/api-validation-jobs.yml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ api_validation_-_netcode_gameobjects_-_2021_3_-_windows:
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
timeout: 20
retries: 10
- command: unity-downloader-cli -u 2021.3/staging -c Editor --fast
- command: unity-downloader-cli -u 2021.3/staging -c editor --path .Editor --fast
timeout: 10
retries: 3
- command: python PythonScripts/PackageJsonCondersor.py
@@ -51,8 +51,8 @@ api_validation_-_netcode_gameobjects_-_2021_3_-_windows:
dependencies:
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
variables:
UPMPVP_CONTEXT_WRENCH: 0.11.3.0
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 0.11.3.0
Wrench: 0.12.1.0

2 changes: 1 addition & 1 deletion .yamato/wrench/package-pack-jobs.yml
Original file line number Diff line number Diff line change
@@ -24,5 +24,5 @@ package_pack_-_netcode_gameobjects:
UPMCI_ACK_LARGE_PACKAGE: 1
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 0.11.3.0
Wrench: 0.12.1.0

110 changes: 55 additions & 55 deletions .yamato/wrench/preview-a-p-v.yml

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions .yamato/wrench/promotion-jobs.yml
Original file line number Diff line number Diff line change
@@ -208,10 +208,10 @@ publish_dry_run_netcode_gameobjects:
ignore_artifact: true
variables:
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
UPMPVP_CONTEXT_WRENCH: 0.11.3.0
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 0.11.3.0
Wrench: 0.12.1.0

# Publish for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
publish_netcode_gameobjects:
@@ -420,8 +420,8 @@ publish_netcode_gameobjects:
ignore_artifact: true
variables:
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
UPMPVP_CONTEXT_WRENCH: 0.11.3.0
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 0.11.3.0
Wrench: 0.12.1.0

6 changes: 3 additions & 3 deletions .yamato/wrench/recipe-regeneration.yml
Original file line number Diff line number Diff line change
@@ -9,14 +9,14 @@ test_-_wrench_jobs_up_to_date:
type: Unity::VM
flavor: b1.large
commands:
- command: dotnet run --project Tools\CI\NGO.Cookbook.csproj
- command: dotnet run --project Tools/CI/NGO.Cookbook.csproj
- command: |-
if [ -n "$(git status --porcelain -- .yamato/wrench)" ]; then
git status
echo "Your repo is not clean - diff output:"
git diff
echo "You must run recipe generation after updating recipes to update the generated YAML!"
echo "Run 'dotnet run --project Tools\CI\NGO.Cookbook.csproj' from the root of your repository to regenerate all job definitions created by wrench."
echo "Run 'dotnet run --project Tools/CI/NGO.Cookbook.csproj' from the root of your repository to regenerate all job definitions created by wrench."
exit 1
fi
variables:
@@ -26,5 +26,5 @@ test_-_wrench_jobs_up_to_date:
cancel_old_ci: true
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 0.11.3.0
Wrench: 0.12.1.0

324 changes: 162 additions & 162 deletions .yamato/wrench/validation-jobs.yml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions .yamato/wrench/wrench_config.json
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@
},
"publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_netcode_gameobjects",
"branch_pattern": "ReleaseSlash",
"wrench_version": "0.11.3.0",
"wrench_version": "0.12.1.0",
"pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json",
"cs_project_path": "Tools\\CI\\NGO.Cookbook.csproj"
"cs_project_path": "Tools/CI/NGO.Cookbook.csproj"
}
2 changes: 1 addition & 1 deletion Tools/CI/NGO.Cookbook.csproj
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="RecipeEngine.Modules.Wrench" Version="0.11.3" />
<PackageReference Include="RecipeEngine.Modules.Wrench" Version="0.12.1" />
</ItemGroup>

</Project>
12 changes: 11 additions & 1 deletion Tools/CI/Settings/NGOSettings.cs
Original file line number Diff line number Diff line change
@@ -9,12 +9,22 @@ public class NGOSettings : AnnotatedSettingsBase
// Path from the root of the repository where packages are located.
readonly string[] packagesRootPaths = {"."};

static ValidationOptions validationOptions = new ValidationOptions()
{
ProjectPath = "testproject",
UtrTestingYamatoTimeout = 40
};

// update this to list all packages in this repo that you want to release.
Dictionary<string, PackageOptions> PackageOptions = new()
{
{
"com.unity.netcode.gameobjects",
new PackageOptions() { ReleaseOptions = new ReleaseOptions() { IsReleasing = true } }
new PackageOptions()
{
ReleaseOptions = new ReleaseOptions() { IsReleasing = true },
ValidationOptions = validationOptions
}
}
};