Skip to content

Commit b9c200d

Browse files
committed
ci: Wrench update to v2.2.0 (#3881)
Updated Wrench to 2.2.0 and regenerated recipes
1 parent e1bb4d2 commit b9c200d

File tree

6 files changed

+18
-12
lines changed

6 files changed

+18
-12
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package_pack_-_netcode_gameobjects:
66
name: Package Pack - netcode.gameobjects
77
agent:
8-
image: package-ci/ubuntu-20.04:default
8+
image: package-ci/ubuntu-22.04:v4
99
type: Unity::VM
1010
flavor: b1.large
1111
commands:
@@ -24,5 +24,5 @@ package_pack_-_netcode_gameobjects:
2424
UPMCI_ACK_LARGE_PACKAGE: 1
2525
metadata:
2626
Job Maintainers: '#rm-packageworks'
27-
Wrench: 1.4.8.0
27+
Wrench: 2.2.0.0
2828

.yamato/wrench/player-build.yml

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

.yamato/wrench/player-test.yml

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

.yamato/wrench/recipe-regeneration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
test_-_wrench_jobs_up_to_date:
66
name: Test - Wrench Jobs up to date
77
agent:
8-
image: package-ci/ubuntu-20.04:default
8+
image: package-ci/ubuntu-20.04:v4
99
type: Unity::VM
1010
flavor: b1.large
1111
commands:
@@ -26,5 +26,5 @@ test_-_wrench_jobs_up_to_date:
2626
cancel_old_ci: true
2727
metadata:
2828
Job Maintainers: '#rm-packageworks'
29-
Wrench: 1.4.8.0
29+
Wrench: 2.2.0.0
3030

Tools/CI/NGO.Cookbook.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="RecipeEngine" Version="7.3.2" />
12-
<PackageReference Include="RecipeEngine.Api" Version="12.2.0" />
11+
<PackageReference Include="RecipeEngine" Version="7.5.0" />
12+
<PackageReference Include="RecipeEngine.Api" Version="12.4.0" />
1313
<PackageReference Include="RecipeEngine.Api.Extensions" Version="7.2.1" />
1414
<PackageReference Include="RecipeEngine.Modules.Api" Version="5.1.0" />
15-
<PackageReference Include="RecipeEngine.Modules.Wrench" Version="1.4.8" />
15+
<PackageReference Include="RecipeEngine.Modules.Wrench" Version="2.2.0" />
1616
</ItemGroup>
1717

1818
</Project>

Tools/CI/Settings/NGOSettings.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using RecipeEngine.Api.Settings;
22
using RecipeEngine.Modules.Wrench.Models;
3+
using RecipeEngine.Modules.Wrench.Platforms;
34
using RecipeEngine.Modules.Wrench.Settings;
45

56
namespace NGO.Cookbook.Settings;
@@ -31,12 +32,9 @@ public class NGOSettings : AnnotatedSettingsBase
3132

3233
public NGOSettings()
3334
{
34-
Wrench = new WrenchSettings(
35-
packagesRootPaths,
36-
PackageOptions
37-
);
38-
35+
Wrench = new WrenchSettings(packagesRootPaths, PackageOptions);
3936
Wrench.PvpProfilesToCheck = new HashSet<string>() { "supported" };
37+
Wrench.Packages["com.unity.netcode.gameobjects"].PackAndPromotePlatformType = EditorPlatformType.Ubuntu2204;
4038
}
4139

4240
public WrenchSettings Wrench { get; private set; }

0 commit comments

Comments
 (0)