Skip to content
Merged
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
Original file line number Diff line number Diff line change
@@ -1,6 +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...
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
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
6 changes: 3 additions & 3 deletions .yamato/wrench/api-validation-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ api_validation_-_probuilder_-_6000_0_-_windows:
type: Unity::VM
flavor: b1.large
commands:
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -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 @@ -51,8 +51,8 @@ api_validation_-_probuilder_-_6000_0_-_windows:
dependencies:
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_probuilder
variables:
UPMPVP_CONTEXT_WRENCH: 1.0.1.0
UPMPVP_CONTEXT_WRENCH: 1.3.0.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 1.0.1.0
Wrench: 1.3.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 @@ -24,5 +24,5 @@ package_pack_-_probuilder:
UPMCI_ACK_LARGE_PACKAGE: 1
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 1.0.1.0
Wrench: 1.3.0.0

117 changes: 61 additions & 56 deletions .yamato/wrench/preview-a-p-v.yml

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions .yamato/wrench/promotion-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ publish_dry_run_probuilder:
type: Unity::VM
flavor: b1.large
commands:
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -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 @@ -178,10 +178,10 @@ publish_dry_run_probuilder:
ignore_artifact: true
variables:
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
UPMPVP_CONTEXT_WRENCH: 1.0.1.0
UPMPVP_CONTEXT_WRENCH: 1.3.0.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 1.0.1.0
Wrench: 1.3.0.0

# Publish for probuilder to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
publish_probuilder:
Expand All @@ -191,7 +191,7 @@ publish_probuilder:
type: Unity::VM
flavor: b1.large
commands:
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -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 @@ -360,8 +360,8 @@ publish_probuilder:
ignore_artifact: true
variables:
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
UPMPVP_CONTEXT_WRENCH: 1.0.1.0
UPMPVP_CONTEXT_WRENCH: 1.3.0.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 1.0.1.0
Wrench: 1.3.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 @@ -26,5 +26,5 @@ test_-_wrench_jobs_up_to_date:
cancel_old_ci: true
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 1.0.1.0
Wrench: 1.3.0.0

185 changes: 95 additions & 90 deletions .yamato/wrench/validation-jobs.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yamato/wrench/wrench_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
},
"publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_probuilder",
"branch_pattern": "ReleaseSlash",
"wrench_version": "1.0.1.0",
"wrench_version": "1.3.0.0",
"pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json",
"cs_project_path": "Tools/CI/ProBuilder.Cookbook.csproj"
}
2 changes: 1 addition & 1 deletion Tools/CI/ProBuilder.Cookbook.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="RecipeEngine.Modules.Wrench" Version="1.0.1" />
<PackageReference Include="RecipeEngine.Modules.Wrench" Version="1.3.0" />
</ItemGroup>

</Project>
16 changes: 14 additions & 2 deletions Tools/CI/Settings/ProBuilderSettings.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
using RecipeEngine.Api.Settings;
using RecipeEngine.Api.Platforms;
using RecipeEngine.Api.Settings;
using RecipeEngine.Modules.Wrench.Models;
using RecipeEngine.Modules.Wrench.Settings;
using RecipeEngine.Platforms;

namespace ProBuilder.Cookbook.Settings;

Expand All @@ -18,7 +20,14 @@ public class ProBuilderSettings : AnnotatedSettingsBase
{
{
ProBuilderPackageName,
new PackageOptions() { ReleaseOptions = new ReleaseOptions() { IsReleasing = true } }
new PackageOptions()
{
ReleaseOptions = new ReleaseOptions() { IsReleasing = true },
ValidationOptions = new ValidationOptions()
{
AdditionalUtrArguments = ["--fail-on-assert"]
}
}
}
};

Expand All @@ -31,6 +40,9 @@ public ProBuilderSettings()

Wrench.Packages[ProBuilderPackageName].CoverageCommands.Enabled = true;
Wrench.Packages[ProBuilderPackageName].CoverageCommands.Commands = [_excludeAssembliesCodeCovCommand];

var defaultMacPlatform = WrenchPackage.DefaultEditorPlatforms[SystemType.MacOS];
Wrench.Packages["com.unity.probuilder"].EditorPlatforms[SystemType.MacOS] = new Platform(new Agent("package-ci/macos-13-arm64:v4", FlavorType.MacDefault, defaultMacPlatform.Agent.Resource, "M1"), defaultMacPlatform.System);
}

public WrenchSettings Wrench { get; private set; }
Expand Down