Skip to content

CI: bump Wrench to 3.11.5 and expand PR Unity version coverage #701

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.

Sign up for GitHub

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
lopezt-unity wants to merge 2 commits into
base: master
Choose a base branch
from
Open

CI: bump Wrench to 3.11.5 and expand PR Unity version coverage #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b4df36
Bump Wrench (RecipeEngine.Modules.Wrench) 2.12.0 -> 3.11.5
lopezt-unity Sep 11, 2026
be1ea65
Test PRs against 6000.0, 6000.3, 6000.6, 6000.7 and trunk
lopezt-unity Sep 11, 2026
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 .Tools/CI/ProBuilder.Cookbook.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="RecipeEngine.Modules.Wrench" Version="2.12.0" />
<PackageReference Include="RecipeEngine.Modules.Wrench" Version="3.11.5" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion .Tools/CI/Recipes/Triggers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ private ISet<IJobBuilder> GetTriggers()
HashSet<IJobBuilder> builders =
[
JobBuilder.Create("Pull Request Trigger")
.WithDependencies(allValidationJobs.Where(d => (d.JobId.Contains("macos") && !d.JobId.Contains("6000.6")) ))
.WithDependencies(allValidationJobs.Where(d => d.JobId.Contains("macos")))
.WithPullRequestTrigger(pr => pr.ExcludeDraft().And().WithTargetBranch("master"),
true, cancelLeftoverJobs: CancelLeftoverJobs.Always)
];
Expand Down
1 change: 0 additions & 1 deletion .Tools/CI/Settings/ProBuilderSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ public static ProBuilderSettings Instance
new PackageOptions()
{
ReleaseOptions = new ReleaseOptions() { IsReleasing = true },
MaximumEditorVersion = "6000.5",
ValidationOptions = new ValidationOptions()
{
AdditionalUtrArguments = ["--fail-on-assert --coverage-pkg-version=1.3.0"]
Expand Down
7 changes: 7 additions & 0 deletions .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
# This is an auto-generated script. Do not edit manually!
set -x

crashReportDir="${TMPDIR%/}/BugReporterCrashReportJson"
if [ -d "$crashReportDir" ]; then
for f in "$crashReportDir"/CrashReport_*.json; do
[ -e "$f" ] || continue
curl -X POST --connect-timeout 5 --max-time 10 -H "Content-Type: application/json" -T "$f" "https://internal-crash-collector.prd.cds.internal.unity3d.com/api/crash" || echo "Failed to upload $f. Ignoring..."
done
fi
set -e
if [ -f "infrastructure_instability_detection_standalone.zip" ]; then
echo "removed existing archive infrastructure_instability_detection_standalone.zip"
Expand Down
2 changes: 1 addition & 1 deletion .yamato/generated-scripts/infrastructure-instability-detection-win.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@echo on
rem This is an auto-generated script. Do not edit manually!

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...
if exist "%TEMP%\BugReporterCrashReportJson" for /f "delims=" %%i in ('dir /b /a-d "%TEMP%\BugReporterCrashReportJson\CrashReport_*.json"') do curl -X POST --connect-timeout 5 --max-time 10 -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...
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
IF EXIST "infrastructure_instability_detection" rmdir /s /q infrastructure_instability_detection
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"
Expand Down
5 changes: 3 additions & 2 deletions .yamato/triggers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ pull_request_trigger:
dependencies:
- path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_0_-_macos13
- path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_3_-_macos13
- path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_4_-_macos13
- path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_5_-_macos13
- path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_6_-_macos13arm
- path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_7_-_macos13arm
- path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_7000_0_-_macos13arm
triggers:
expression: |-
NOT pull_request.draft AND
Expand Down
7 changes: 4 additions & 3 deletions .yamato/wrench/api-validation-jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ api_validation_-_probuilder_-_6000_0_-_win10:
type: Unity::VM
flavor: b1.large
commands:
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
- command: curl "%WRENCH_LOCALAPV_URL%" -o wrench-localapv.zip
- command: 7z x -aoa wrench-localapv.zip
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
- command: python PythonScripts/print_machine_info.py
Expand Down Expand Up @@ -60,8 +60,9 @@ api_validation_-_probuilder_-_6000_0_-_win10:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_CONTEXT_WRENCH: 2.12.0.0
UPMPVP_CONTEXT_WRENCH: 3.11.5.0
WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.12.0.0
Wrench: 3.11.5.0

3 changes: 2 additions & 1 deletion .yamato/wrench/package-pack-jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ package_pack_-_probuilder:
- upm-ci~/packages/**/*
variables:
UPMCI_ACK_LARGE_PACKAGE: 1
WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.12.0.0
Wrench: 3.11.5.0

Loading