Skip to content
Open
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion .github/workflows/pr-description-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v6
uses: actions/checkout@v7

- name: Check PR description
uses: actions/github-script@v9
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-supervisor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
timeout-minutes: 720
steps:
- name: Checkout repository
uses: actions/checkout@v6
uses: actions/checkout@v7

- name: Wait and Verify Yamato Job Status
env:
Expand Down
6 changes: 3 additions & 3 deletions .yamato/project.metafile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
small_agent_platform:
- name: ubuntu
type: Unity::VM
image: package-ci/ubuntu-22.04:v4.85.0
image: package-ci/ubuntu-22.04:v4.86.0
flavor: b1.small


Expand All @@ -38,13 +38,13 @@ test_platforms:
default:
- name: ubuntu
type: Unity::VM
image: package-ci/ubuntu-22.04:v4.85.0
image: package-ci/ubuntu-22.04:v4.86.0
flavor: b1.large
standalone: StandaloneLinux64
desktop:
- name: ubuntu
type: Unity::VM
image: package-ci/ubuntu-22.04:v4.85.0
image: package-ci/ubuntu-22.04:v4.86.0
flavor: b1.large
smaller_flavor: b1.medium
standalone: StandaloneLinux64
Expand Down
4 changes: 2 additions & 2 deletions .yamato/wrench/api-validation-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_win10:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
UPMPVP_CONTEXT_WRENCH: 3.2.0.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.9.0.0
Wrench: 3.2.0.0

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

14 changes: 7 additions & 7 deletions .yamato/wrench/preview-a-p-v.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ all_preview_apv_jobs:
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_win10
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.9.0.0
Wrench: 3.2.0.0

# Functional tests for dependents found in the latest 6000.0 manifest (MacOS).
preview_apv_-_6000_0_-_macos13:
Expand Down Expand Up @@ -70,10 +70,10 @@ preview_apv_-_6000_0_-_macos13:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
UPMPVP_CONTEXT_WRENCH: 3.2.0.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.9.0.0
Wrench: 3.2.0.0

# Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu).
preview_apv_-_6000_0_-_ubuntu2204:
Expand Down Expand Up @@ -128,10 +128,10 @@ preview_apv_-_6000_0_-_ubuntu2204:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
UPMPVP_CONTEXT_WRENCH: 3.2.0.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.9.0.0
Wrench: 3.2.0.0

# Functional tests for dependents found in the latest 6000.0 manifest (Windows).
preview_apv_-_6000_0_-_win10:
Expand Down Expand Up @@ -187,8 +187,8 @@ preview_apv_-_6000_0_-_win10:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
UPMPVP_CONTEXT_WRENCH: 3.2.0.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.9.0.0
Wrench: 3.2.0.0

8 changes: 4 additions & 4 deletions .yamato/wrench/promotion-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ publish_dry_run_netcode_gameobjects:
unzip: true
variables:
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
UPMPVP_CONTEXT_WRENCH: 3.2.0.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.9.0.0
Wrench: 3.2.0.0

# Publish for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
publish_netcode_gameobjects:
Expand Down Expand Up @@ -125,9 +125,9 @@ publish_netcode_gameobjects:
unzip: true
variables:
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
UPMPVP_CONTEXT_WRENCH: 3.2.0.0
allow_on: branch match "^release/.*"
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.9.0.0
Wrench: 3.2.0.0

2 changes: 1 addition & 1 deletion .yamato/wrench/recipe-regeneration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ test_-_wrench_jobs_up_to_date:
cancel_old_ci: true
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.9.0.0
Wrench: 3.2.0.0

12 changes: 6 additions & 6 deletions .yamato/wrench/validation-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_macos13:
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
UPMPVP_CONTEXT_WRENCH: 3.2.0.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.9.0.0
Wrench: 3.2.0.0
labels:
- Packages:netcode.gameobjects

Expand Down Expand Up @@ -139,10 +139,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_ubuntu2204:
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
UPMPVP_CONTEXT_WRENCH: 3.2.0.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.9.0.0
Wrench: 3.2.0.0
labels:
- Packages:netcode.gameobjects

Expand Down Expand Up @@ -209,10 +209,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_win10:
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
UPMPVP_CONTEXT_WRENCH: 3.2.0.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.9.0.0
Wrench: 3.2.0.0
labels:
- Packages:netcode.gameobjects

2 changes: 1 addition & 1 deletion .yamato/wrench/wrench_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_netcode_gameobjects",
"branch_pattern": "ReleaseSlash",
"wrench_version": "2.9.0.0",
"wrench_version": "3.2.0.0",
"pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json",
"cs_project_path": "Tools/CI/NGO.Cookbook.csproj"
}
10 changes: 5 additions & 5 deletions Tools/CI/NGO.Cookbook.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="RecipeEngine" Version="8.1.0" />
<PackageReference Include="RecipeEngine.Api" Version="12.8.0" />
<PackageReference Include="RecipeEngine.Api.Extensions" Version="7.2.1" />
<PackageReference Include="RecipeEngine.Modules.Api" Version="5.1.0" />
<PackageReference Include="RecipeEngine.Modules.Wrench" Version="2.9.0" />
<PackageReference Include="RecipeEngine" Version="9.1.0" />
<PackageReference Include="RecipeEngine.Api" Version="14.1.0" />
<PackageReference Include="RecipeEngine.Api.Extensions" Version="8.1.1" />
<PackageReference Include="RecipeEngine.Modules.Api" Version="6.1.0" />
<PackageReference Include="RecipeEngine.Modules.Wrench" Version="3.2.0" />
</ItemGroup>

</Project>
39 changes: 6 additions & 33 deletions Tools/scripts/ReleaseAutomation/release_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,57 +90,30 @@ def __init__(self):

self.yamato_build_automation_configs = [
{
"job_name": "Build Sample for Windows with minimal supported editor (2022.3), burst ON, IL2CPP",
"job_name": "Build Sample for Windows with supported editor (6000.0), burst ON, IL2CPP",
"variables": [
{ "key": "BURST_ON_OFF", "value": "on" },
{ "key": "PLATFORM_WIN64_MAC_ANDROID", "value": "win64" },
{ "key": "SCRIPTING_BACKEND_IL2CPP_MONO", "value": "il2cpp" },
{ "key": "UNITY_VERSION", "value": "2022.3" } # Minimal supported editor
{ "key": "UNITY_VERSION", "value": "6000.0" }
]
},
{
"job_name": "Build Sample for Windows with latest functional editor (6000.3), burst ON, IL2CPP",
"variables": [
{ "key": "BURST_ON_OFF", "value": "on" },
{ "key": "PLATFORM_WIN64_MAC_ANDROID", "value": "win64" },
{ "key": "SCRIPTING_BACKEND_IL2CPP_MONO", "value": "il2cpp" },
{ "key": "UNITY_VERSION", "value": "6000.3" } # Editor that most our users will use (not alpha). Sometimes when testing on trunk we have weird editor issues not caused by us so the preference will be to test on latest editor that our users will use.
]
},
{
"job_name": "Build Sample for MacOS with minimal supported editor (2022.3), burst OFF, Mono",
"job_name": "Build Sample for MacOS with supported editor (6000.0), burst OFF, Mono",
"variables": [
{ "key": "BURST_ON_OFF", "value": "off" },
{ "key": "PLATFORM_WIN64_MAC_ANDROID", "value": "mac" },
{ "key": "SCRIPTING_BACKEND_IL2CPP_MONO", "value": "mono" },
{ "key": "UNITY_VERSION", "value": "2022.3" } # Minimal supported editor
]
},
{
"job_name": "Build Sample for MacOS with latest functional editor (6000.3), burst OFF, Mono",
"variables": [
{ "key": "BURST_ON_OFF", "value": "off" },
{ "key": "PLATFORM_WIN64_MAC_ANDROID", "value": "mac" },
{ "key": "SCRIPTING_BACKEND_IL2CPP_MONO", "value": "mono" },
{ "key": "UNITY_VERSION", "value": "6000.3" } # Editor that most our users will use (not alpha). Sometimes when testing on trunk we have weird editor issues not caused by us so the preference will be to test on latest editor that our users will use.
]
},
{
"job_name": "Build Sample for Android with minimal supported editor (2022.3), burst ON, IL2CPP",
"variables": [
{ "key": "BURST_ON_OFF", "value": "on" },
{ "key": "PLATFORM_WIN64_MAC_ANDROID", "value": "android" },
{ "key": "SCRIPTING_BACKEND_IL2CPP_MONO", "value": "il2cpp" },
{ "key": "UNITY_VERSION", "value": "2022.3" } # Minimal supported editor
{ "key": "UNITY_VERSION", "value": "6000.0" }
]
},
{
"job_name": "Build Sample for Android with latest functional editor (6000.3), burst ON, IL2CPP",
"job_name": "Build Sample for Android with supported editor (6000.0), burst ON, IL2CPP",
"variables": [
{ "key": "BURST_ON_OFF", "value": "on" },
{ "key": "PLATFORM_WIN64_MAC_ANDROID", "value": "android" },
{ "key": "SCRIPTING_BACKEND_IL2CPP_MONO", "value": "il2cpp" },
{ "key": "UNITY_VERSION", "value": "6000.3" } # Editor that most our users will use (not alpha). Sometimes when testing on trunk we have weird editor issues not caused by us so the preference will be to test on latest editor that our users will use.
{ "key": "UNITY_VERSION", "value": "6000.0" }
]
}
]
Expand Down
4 changes: 2 additions & 2 deletions testproject-tools-integration/Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"com.unity.multiplayer.tools": "2.2.8",
"com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects",
"com.unity.test-framework": "1.6.0",
"com.unity.test-framework.performance": "3.4.1",
"com.unity.transport": "2.7.2",
"com.unity.test-framework.performance": "3.4.2",
"com.unity.transport": "2.7.3",
"com.unity.modules.accessibility": "1.0.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
Expand Down
Loading