From 47c37994bfa7e2f8baea2c060f14de3e056e387c Mon Sep 17 00:00:00 2001 From: michal-chrobot Date: Wed, 20 Aug 2025 14:46:14 +0200 Subject: [PATCH 1/2] Updated Wrench settings and removed testproject-tools-integration exception from Renovate since it's not present here anymore --- .github/renovate.json5 | 3 +-- Tools/CI/Settings/NGOSettings.cs | 8 +++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 1b96abd02f..1143236874 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -16,8 +16,7 @@ "com.unity.netcode.gameobjects/**/*", "Examples/**/*", "testproject/**/*", - "minimalproject/**/*", - "testproject-tools-integration/**/*" + "minimalproject/**/*" ], "packageRules": [ // Run unity-upm-project and unity-upm-package only on weekends to reduce PR noise diff --git a/Tools/CI/Settings/NGOSettings.cs b/Tools/CI/Settings/NGOSettings.cs index a174da52e2..6f40ccae20 100644 --- a/Tools/CI/Settings/NGOSettings.cs +++ b/Tools/CI/Settings/NGOSettings.cs @@ -32,12 +32,10 @@ public NGOSettings() { Wrench = new WrenchSettings( packagesRootPaths, - PackageOptions, - false, - false, - @"Tools\CI\NGO.Cookbook.csproj"); // There should be fix soon and there should be no need of specifying the path + PackageOptions + ); - Wrench.PvpProfilesToCheck = new HashSet() { "supported" }; + Wrench.PvpProfilesToCheck = new HashSet() { "supported" }; } public WrenchSettings Wrench { get; private set; } From 046dbc95588e6f0e03532db5dca7a5ea9a0db8ca Mon Sep 17 00:00:00 2001 From: michal-chrobot Date: Wed, 20 Aug 2025 14:48:10 +0200 Subject: [PATCH 2/2] regenerated recipes --- .yamato/wrench/recipe-regeneration.yml | 4 ++-- .yamato/wrench/wrench_config.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.yamato/wrench/recipe-regeneration.yml b/.yamato/wrench/recipe-regeneration.yml index 901d59cfb3..71a75e3978 100644 --- a/.yamato/wrench/recipe-regeneration.yml +++ b/.yamato/wrench/recipe-regeneration.yml @@ -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: diff --git a/.yamato/wrench/wrench_config.json b/.yamato/wrench/wrench_config.json index 21ec01bae9..0511a4b0bc 100644 --- a/.yamato/wrench/wrench_config.json +++ b/.yamato/wrench/wrench_config.json @@ -33,5 +33,5 @@ "branch_pattern": "ReleaseSlash", "wrench_version": "1.0.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" } \ No newline at end of file