Skip to content

Commit fc09ebf

Browse files
committed
Merge branch 'develop' into renovate/develop-package-ci-ubuntu-22.04-4.x
2 parents 768846f + 582cdea commit fc09ebf

34 files changed

+350
-219
lines changed

.github/workflows/pr-description-validation.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,29 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: Checkout code
24-
uses: actions/checkout@v5
24+
uses: actions/checkout@v6
2525

2626
- name: Check PR description
2727
uses: actions/github-script@v8
2828
with:
2929
script: |
3030
const pr = context.payload.pull_request;
3131
const body = pr.body || '';
32+
33+
// List of users to skip description validation
34+
// This should be automations where we don't care that much about the description format
35+
const skipUsersPrefixes = [
36+
'unity-renovate',
37+
'svc-'
38+
];
39+
40+
// If PR author is in the skip list, exit early
41+
const author = pr.user.login;
42+
console.log(`PR author: ${author}`);
43+
if (skipUsersPrefixes.some(prefix => author.startsWith(prefix))) {
44+
console.log(`Skipping PR description check for user: ${author}`);
45+
return;
46+
}
3247
3348
// List of mandatory PR sections
3449
const requiredSections = [

.github/workflows/pr-supervisor.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
timeout-minutes: 720
2626
steps:
2727
- name: Checkout repository
28-
uses: actions/checkout@v4
28+
uses: actions/checkout@v6
2929

3030
- name: Wait and Verify Yamato Job Status
3131
env:

.yamato/_run-all.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ run_all_package_tests:
3030
{% endfor -%}
3131

3232

33-
# Runs all package tests on default editor
33+
# Runs all package tests on default editor (latest supported editor)
3434
run_all_package_tests_{{ validation_editors.default }}:
3535
name: Run All Package Tests [{{ validation_editors.default }} only]
3636
dependencies:
3737
{% for platform in test_platforms.desktop -%}
3838
- .yamato/package-tests.yml#package_test_-_ngo_{{ validation_editors.default }}_{{ platform.name }}
3939
{% endfor -%}
4040

41-
# Runs all package tests on mimimum supported editor
41+
# Runs all package tests on minimal supported editor
4242
run_all_package_tests_{{ validation_editors.minimal }}:
4343
name: Run All Package Tests [{{ validation_editors.minimal }}]
4444
dependencies:
@@ -74,7 +74,7 @@ run_all_project_tests_{{ validation_editors.default }}:
7474
{% endif -%}
7575
{% endfor -%}
7676

77-
# Runs all projects tests on mimimal supported editor
77+
# Runs all projects tests on minimal supported editor
7878
run_all_project_tests_{{ validation_editors.minimal }}:
7979
name: Run All Project Tests [{{ validation_editors.minimal }}]
8080
dependencies:
@@ -111,7 +111,7 @@ run_all_webgl_builds:
111111
{% endfor -%}
112112

113113

114-
# Runs all WebGL builds on default editor
114+
# Runs all WebGL builds on default editor (latest supported editor)
115115
run_all_webgl_builds_{{ validation_editors.default }}:
116116
name: Run All WebGl Build [{{ validation_editors.default }} only]
117117
dependencies:
@@ -121,7 +121,7 @@ run_all_webgl_builds_{{ validation_editors.default }}:
121121
{% endfor -%}
122122
{% endfor -%}
123123

124-
# Runs all WebGL builds on 2022.3 editor
124+
# Runs all WebGL builds on minimal supported editor
125125
run_all_webgl_builds_{{ validation_editors.minimal }}:
126126
name: Run All WebGl Build [{{ validation_editors.minimal }}]
127127
dependencies:
@@ -147,6 +147,7 @@ run_all_project_tests_desktop_standalone:
147147
{% endfor -%}
148148

149149

150+
# Runs all Desktop tests on default editor (latest supported editor)
150151
run_all_project_tests_desktop_standalone_{{ validation_editors.default }}:
151152
name: Run All Standalone Tests - Desktop [{{ validation_editors.default }} only]
152153
dependencies:
@@ -158,7 +159,7 @@ run_all_project_tests_desktop_standalone_{{ validation_editors.default }}:
158159
{% endfor -%}
159160
{% endfor -%}
160161

161-
# Runs all Desktop tests on mimimum supported editor
162+
# Runs all Desktop tests on minimal supported editor
162163
run_all_project_tests_desktop_standalone_{{ validation_editors.minimal }}:
163164
name: Run All Standalone Tests - Desktop [{{ validation_editors.minimal }}]
164165
dependencies:
@@ -193,7 +194,7 @@ run_all_project_tests_mobile_standalone_{{ validation_editors.default }}:
193194
{% endfor -%}
194195
{% endfor -%}
195196

196-
# Runs all Mobile tests on mimimum supported editor
197+
# Runs all Mobile tests on minimal supported editor
197198
run_all_project_tests_mobile_standalone_{{ validation_editors.minimal }}:
198199
name: Run All Standalone Tests - Mobile [{{ validation_editors.minimal }}]
199200
dependencies:
@@ -227,7 +228,7 @@ run_all_project_tests_console_standalone_{{ validation_editors.default }}:
227228
{% endfor -%}
228229
{% endfor -%}
229230

230-
# Runs all Console tests on mimimum supported editor
231+
# Runs all Console tests on minimal supported editor
231232
run_all_project_tests_console_standalone_{{ validation_editors.minimal }}:
232233
name: Run All Standalone Tests - Console [{{ validation_editors.minimal }}]
233234
dependencies:

.yamato/_triggers.yml

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# Nightly:
2525
# This test validates same subset as pull_request_trigger with addition of mobile/console tests and webgl builds
2626
# Runs daily on develop (local configuration)
27-
# Includes all test types but only on default editor (latest supported editor).
27+
# Includes all test types but only on {{ validation_editors.default }} (latest supported editor).
2828
# Adds platform-specific and APV validation
2929

3030
# Weekly:
@@ -72,15 +72,15 @@ pr_code_changes_checks:
7272
# Run API validation to early-detect all new APIs that would force us to release new minor version of the package. Note that for this to work the package version in package.json must correspond to "actual package state" which means that it should be higher than last released version
7373
- .yamato/vetting-test.yml#vetting_test
7474

75-
# Run package EditMode and Playmode package tests on default editor (latest supported editor) and an older supported editor
75+
# Run package EditMode and Playmode package tests on {{ validation_editors.default }} (latest supported editor) and an {{ validation_editors.minimal }} supported editor
7676
- .yamato/package-tests.yml#package_test_-_ngo_{{ validation_editors.default }}_mac
7777
- .yamato/package-tests.yml#package_test_-_ngo_{{ validation_editors.minimal }}_win
7878

79-
# Run testproject EditMode and Playmode project tests on default editor (latest supported editor) and an older supported editor
79+
# Run testproject EditMode and Playmode project tests on {{ validation_editors.default }} (latest supported editor) and an {{ validation_editors.minimal }} supported editor
8080
- .yamato/project-tests.yml#test_testproject_win_{{ validation_editors.default }}
8181
- .yamato/project-tests.yml#test_testproject_mac_{{ validation_editors.minimal }}
8282

83-
# Run tools integration tests EditMode and Playmode tests on default editor (latest supported editor) and an older supported editor
83+
# Run tools integration tests EditMode and Playmode tests on {{ validation_editors.default }} (latest supported editor) and an {{ validation_editors.minimal }} supported editor
8484
- .yamato/project-tests.yml#test_testproject-tools-integration_ubuntu_{{ validation_editors.minimal }}
8585
- .yamato/project-tests.yml#test_testproject-tools-integration_win_{{ validation_editors.default }}
8686

@@ -109,13 +109,11 @@ pr_code_changes_checks:
109109
cancel_old_ci: true
110110

111111

112-
113-
114-
# Run all tests on default editor (latest supported editor) on nightly basis.
112+
# Run all tests on {{ validation_editors.default }} (latest supported editor) on nightly basis.
115113
# Same subset as pull_request_trigger with addition of mobile/desktop/console tests and webgl builds
116-
# Those tests are all running on default editor (latest supported editor) since it's daily and running all of them would add a lot of overhead
114+
# Those tests are all running on {{ validation_editors.default }} (latest supported editor) since it's daily and running all of them would add a lot of overhead
117115
develop_nightly:
118-
name: "\U0001F319 [Nightly] Run All Tests [default and 2022]"
116+
name: "\U0001F319 [Nightly] Run All Tests [{{ validation_editors.default }} and {{ validation_editors.minimal }}]"
119117
triggers:
120118
recurring:
121119
- branch: develop
@@ -129,25 +127,25 @@ develop_nightly:
129127
- .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.minimal }}
130128
# Run APV jobs to make sure the change won't break any dependants
131129
- .yamato/wrench/preview-a-p-v.yml#all_preview_apv_jobs
132-
# Run package EditMode and Playmode tests on desktop platforms on default editor (latest supported editor) and {{ validation_editors.minimal }}
130+
# Run package EditMode and Playmode tests on desktop platforms on {{ validation_editors.default }} (latest supported editor) and {{ validation_editors.minimal }}
133131
- .yamato/_run-all.yml#run_all_package_tests_{{ validation_editors.default }}
134132
- .yamato/_run-all.yml#run_all_package_tests_{{ validation_editors.minimal }}
135-
# Run project EditMode and PLaymode tests on desktop platforms on default editor (latest supported editor) and {{ validation_editors.minimal }}
133+
# Run project EditMode and PLaymode tests on desktop platforms on {{ validation_editors.default }} (latest supported editor) and {{ validation_editors.minimal }}
136134
- .yamato/_run-all.yml#run_all_project_tests_{{ validation_editors.default }}
137135
- .yamato/_run-all.yml#run_all_project_tests_{{ validation_editors.minimal }}
138-
# Run Runtime tests on desktop players on default editor (latest supported editor) and {{ validation_editors.minimal }}
136+
# Run Runtime tests on desktop players on {{ validation_editors.default }} (latest supported editor) and {{ validation_editors.minimal }}
139137
- .yamato/_run-all.yml#run_all_project_tests_desktop_standalone_{{ validation_editors.default }}
140138
- .yamato/_run-all.yml#run_all_project_tests_desktop_standalone_{{ validation_editors.minimal }}
141-
# Run Runtime tests on mobile players on default editor (latest supported editor) and {{ validation_editors.minimal }}
139+
# Run Runtime tests on mobile players on {{ validation_editors.default }} (latest supported editor) and {{ validation_editors.minimal }}
142140
- .yamato/_run-all.yml#run_all_project_tests_mobile_standalone_{{ validation_editors.default }}
143141
- .yamato/_run-all.yml#run_all_project_tests_mobile_standalone_{{ validation_editors.minimal }}
144-
# Run Runtime tests on console players on default editor (latest supported editor) and {{ validation_editors.minimal }}
142+
# Run Runtime tests on console players on {{ validation_editors.default }} (latest supported editor) and {{ validation_editors.minimal }}
145143
- .yamato/_run-all.yml#run_all_project_tests_console_standalone_{{ validation_editors.default }}
146144
- .yamato/_run-all.yml#run_all_project_tests_console_standalone_{{ validation_editors.minimal }}
147-
# Build player for webgl platform on default editor (latest supported editor) and {{ validation_editors.minimal }}
145+
# Build player for webgl platform on {{ validation_editors.default }} (latest supported editor) and {{ validation_editors.minimal }}
148146
- .yamato/_run-all.yml#run_all_webgl_builds_{{ validation_editors.default }}
149147
- .yamato/_run-all.yml#run_all_webgl_builds_{{ validation_editors.minimal }}
150-
# Run updated dependencies test on default editor (latest supported editor) and {{ validation_editors.minimal }}
148+
# Build player for webgl platform on {{ validation_editors.default }} (latest supported editor) and {{ validation_editors.minimal }}
151149
- .yamato/project-updated-dependencies-test.yml#updated-dependencies_testproject_NGO_ubuntu_{{ validation_editors.default }}
152150
- .yamato/project-updated-dependencies-test.yml#updated-dependencies_testproject_NGO_win_{{ validation_editors.minimal }}
153151
# Run API validation to early-detect all new APIs that would force us to release new minor version of the package. Note that for this to work the package version in package.json must correspond to "actual package state" which means that it should be higher than last released version
@@ -157,7 +155,7 @@ develop_nightly:
157155
# Run all tests on weekly bases
158156
# Same subset as develop_nightly but runs per all supported editors as well as executes code coverage test and runs project standards per project
159157
# It's not running wrench jobs since those will run either way in nightly test run
160-
# This in contrast to nightly checks will run tests on all editors (not only default). Running those on weekly basis and default editor (latest supported editor) tests nightly should be a good balance between making sure that tests are passing and overhead of running lots of tests
158+
# This in contrast to nightly checks will run tests on all editors (not only {{ validation_editors.default }}). Running those on weekly basis and {{ validation_editors.default }} (latest supported editor) tests nightly should be a good balance between making sure that tests are passing and overhead of running lots of tests
161159
develop_weekly_trunk:
162160
name: "\U0001F319 [Weekly] Run All Tests"
163161
triggers:
@@ -180,7 +178,7 @@ develop_weekly_trunk:
180178
- .yamato/_run-all.yml#run_all_project_tests_mobile_standalone
181179
# Run Runtime tests on console players
182180
- .yamato/_run-all.yml#run_all_project_tests_console_standalone
183-
# Build player for webgl platform on default editor (latest supported editor)
181+
# Build player for webgl platform on {{ validation_editors.default }} (latest supported editor)
184182
- .yamato/_run-all.yml#run_all_webgl_builds
185183
# Run code coverage test
186184
- .yamato/code-coverage.yml#code_coverage_ubuntu_{{ validation_editors.default }}

.yamato/code-coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# CONFIGURATION STRUCTURE--------------------------------------------------------------
1313
# Jobs are generated using nested loops through:
1414
# 1. For default platform only (Ubuntu) since coverage would not vary between platforms (no need for checks on more platforms)
15-
# 2. For default editor version (validation_editors.default) since coverage would not vary between editors (no need for checks on more editors)
15+
# 2. For default editor version ({{ validation_editors.default }}) since coverage would not vary between editors (no need for checks on more editors)
1616

1717
#TECHNICAL CONSIDERATIONS---------------------------------------------------------------
1818
# In theory this job also runs package tests, but we don't want to use it as default since is heavier (because of added coverage analysis) and coverage is not changing that often

.yamato/generated-scripts/infrastructure-instability-detection-linux.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ if [ -d "infrastructure_instability_detection_standalone" ]; then
1313
rm -rf "infrastructure_instability_detection_standalone" || true
1414
fi
1515

16-
echo "downloading and extracting infrastructure_instability_detection_standalone@1.0.0"
17-
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.0.0/ubuntu.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5 || true
16+
echo "downloading and extracting infrastructure_instability_detection_standalone@1.2.2"
17+
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.2.2/ubuntu.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5 || true
1818

1919
if [ -d "infrastructure_instability_detection" ]; then
2020
echo "removing infrastructure_instability_detection folder to avoid name clash"

.yamato/generated-scripts/infrastructure-instability-detection-mac.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ if [ -d "infrastructure_instability_detection_standalone" ]; then
1313
rm -rf "infrastructure_instability_detection_standalone" || true
1414
fi
1515

16-
echo "downloading and extracting infrastructure_instability_detection_standalone@1.0.0"
17-
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.0.0/macos.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5 || true
16+
echo "downloading and extracting infrastructure_instability_detection_standalone@1.2.2"
17+
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.2.2/macos.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5 || true
1818

1919
if [ -d "infrastructure_instability_detection" ]; then
2020
echo "removing infrastructure_instability_detection folder to avoid name clash"

.yamato/generated-scripts/infrastructure-instability-detection-win.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
rem This is an auto-generated script. Do not edit manually!
33

44
if exist "%TEMP%\BugReporterCrashReportJson" for /f "delims=" %%i in ('dir /b /a-d "%TEMP%\BugReporterCrashReportJson\*.json"') do curl -X POST -H "Content-Type: application/json" -T "%TEMP%\BugReporterCrashReportJson\%%i" "https://internal-crash-collector.prd.cds.internal.unity3d.com/api/crash" || echo Failed to upload %%i. Ignoring...
5-
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.0.0/windows.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5
5+
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.2.2/windows.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5
66
IF EXIST "infrastructure_instability_detection" rmdir /s /q infrastructure_instability_detection
77
powershell.exe -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('infrastructure_instability_detection_standalone.zip', '.'); }" && DEL "infrastructure_instability_detection_standalone.zip"
88
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/patterns.zip" --output patterns.zip --retry 5

.yamato/ngo-publish.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
ngo_release_preparation:
22
name: "NGO release preparation"
33
agent: { type: Unity::VM, flavor: b1.small, image: package-ci/ubuntu-22.04:v4 }
4-
#triggers:
5-
# recurring:
6-
# - branch: develop # We make new releases from this branch
7-
# frequency: "10 ? * 1" # Runs every Sunday at 10:00 AM
4+
triggers:
5+
recurring:
6+
- branch: develop # We make new releases from this branch
7+
frequency: "10 ? * 1" # Runs every Sunday at 10:00 AM
88
commands:
99
- pip install PyGithub
1010
- pip install GitPython

.yamato/project-builders/project-builders.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ build_{{ netcodeProject[0] }}_project:
2626
image: package-ci/win10:v4
2727
flavor: b1.xlarge
2828
variables:
29-
UNITY_VERSION: 6000.2
29+
UNITY_VERSION: 6000.0
3030
SCRIPTING_BACKEND_IL2CPP_MONO: il2cpp
3131
BURST_ON_OFF: on
3232
PLATFORM_WIN64_MAC_ANDROID: win64

0 commit comments

Comments
 (0)