Skip to content
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

Jump to bottom

Set jobs to rerun: always + remove metafiles #8094

Merged
merged 1 commit into from
Sep 12, 2024
Merged

Set jobs to rerun: always + remove metafiles #8094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .yamato/_abv.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ graphics_repo_nightly_trunk:
frequency: 23 ? * 7 # At 11pm every Saturday
dependencies:
- path: .yamato/_templates.yml#all_template_ci_trunk
rerun: on_new_revision
rerun: always
- path: .yamato/all-postprocessing.yml#PostProcessing_trunk
rerun: on_new_revision
rerun: always
120 changes: 80 additions & 40 deletions .yamato/_templates.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ pre_pack_hdrp_template_Win_trunk:
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
- .Editor\Unity.exe -projectPath com.unity.template-hd -batchmode -quit -logFile ./Editor.log
dependencies:
- .yamato/_editor_priming.yml#editor:priming:trunk:Win
- path: .yamato/_editor_priming.yml#editor:priming:trunk:Win
return: always
artifacts:
primed:
paths:
Expand Down Expand Up @@ -47,8 +48,10 @@ test_hdrp_template_Win_trunk:
image: package-ci/win11:v4
flavor: b1.large
dependencies:
- .yamato/_templates.yml#pack_hdrp_template_Win_trunk
- .yamato/_editor_priming.yml#editor:priming:trunk:Win
- path: .yamato/_templates.yml#pack_hdrp_template_Win_trunk
return: always
- path: .yamato/_editor_priming.yml#editor:priming:trunk:Win
return: always
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
Expand All @@ -68,7 +71,8 @@ pre_pack_hdrp_template_OSX_trunk:
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
- .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-hd -batchmode -quit -logFile ./Editor.log
dependencies:
- .yamato/_editor_priming.yml#editor:priming:trunk:OSX
- path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX
return: always
artifacts:
primed:
paths:
Expand Down Expand Up @@ -99,8 +103,10 @@ test_hdrp_template_OSX_trunk:
image: package-ci/macos-13:v4
flavor: m1.mac
dependencies:
- .yamato/_templates.yml#pack_hdrp_template_OSX_trunk
- .yamato/_editor_priming.yml#editor:priming:trunk:OSX
- path: .yamato/_templates.yml#pack_hdrp_template_OSX_trunk
return: always
- path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX
return: always
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
Expand All @@ -119,10 +125,14 @@ publish_hdrp_template_trunk:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci template publish --project-path com.unity.template-hd
dependencies:
- .yamato/_templates.yml#test_hdrp_template_Win_trunk
- .yamato/_templates.yml#test_hdrp_template_OSX_trunk
- .yamato/_templates.yml#pack_hdrp_template_Win_trunk
- .yamato/_templates.yml#pack_hdrp_template_OSX_trunk
- path: .yamato/_templates.yml#test_hdrp_template_Win_trunk
return: always
- path: .yamato/_templates.yml#test_hdrp_template_OSX_trunk
return: always
- path: .yamato/_templates.yml#pack_hdrp_template_Win_trunk
return: always
- path: .yamato/_templates.yml#pack_hdrp_template_OSX_trunk
return: always
artifacts:
packages:
paths:
Expand All @@ -138,10 +148,14 @@ publish_hdrp_template_trunk_dry_run:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci template publish --project-path com.unity.template-hd --dry-run
dependencies:
- .yamato/_templates.yml#test_hdrp_template_Win_trunk
- .yamato/_templates.yml#test_hdrp_template_OSX_trunk
- .yamato/_templates.yml#pack_hdrp_template_Win_trunk
- .yamato/_templates.yml#pack_hdrp_template_OSX_trunk
- path: .yamato/_templates.yml#test_hdrp_template_Win_trunk
return: always
- path: .yamato/_templates.yml#test_hdrp_template_OSX_trunk
return: always
- path: .yamato/_templates.yml#pack_hdrp_template_Win_trunk
return: always
- path: .yamato/_templates.yml#pack_hdrp_template_OSX_trunk
return: always
artifacts:
packages:
paths:
Expand All @@ -158,7 +172,8 @@ pre_pack_hdrp_blank_template_Win_trunk:
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
- .Editor\Unity.exe -projectPath com.unity.template.hdrp-blank -batchmode -quit -logFile ./Editor.log
dependencies:
- .yamato/_editor_priming.yml#editor:priming:trunk:Win
- path: .yamato/_editor_priming.yml#editor:priming:trunk:Win
return: always
artifacts:
primed:
paths:
Expand Down Expand Up @@ -189,8 +204,10 @@ test_hdrp_blank_template_Win_trunk:
image: package-ci/win11:v4
flavor: b1.large
dependencies:
- .yamato/_templates.yml#pack_hdrp_blank_template_Win_trunk
- .yamato/_editor_priming.yml#editor:priming:trunk:Win
- path: .yamato/_templates.yml#pack_hdrp_blank_template_Win_trunk
rerun: always
- path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX
return: always
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
Expand All @@ -210,7 +227,8 @@ pre_pack_hdrp_blank_template_OSX_trunk:
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
- .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template.hdrp-blank -batchmode -quit -logFile ./Editor.log
dependencies:
- .yamato/_editor_priming.yml#editor:priming:trunk:OSX
- path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX
return: always
artifacts:
primed:
paths:
Expand Down Expand Up @@ -241,8 +259,10 @@ test_hdrp_blank_template_OSX_trunk:
image: package-ci/macos-13:v4
flavor: m1.mac
dependencies:
- .yamato/_templates.yml#pack_hdrp_blank_template_OSX_trunk
- .yamato/_editor_priming.yml#editor:priming:trunk:OSX
- path: .yamato/_templates.yml#pack_hdrp_blank_template_OSX_trunk
return: always
- path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX
return: always
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
Expand Down Expand Up @@ -280,10 +300,14 @@ publish_hdrp_blank_template_trunk_dry_run:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci template publish --project-path com.unity.template.hdrp-blank --dry-run
dependencies:
- .yamato/_templates.yml#test_hdrp_blank_template_Win_trunk
- .yamato/_templates.yml#test_hdrp_blank_template_OSX_trunk
- .yamato/_templates.yml#pack_hdrp_blank_template_Win_trunk
- .yamato/_templates.yml#pack_hdrp_blank_template_OSX_trunk
- path: .yamato/_templates.yml#test_hdrp_blank_template_Win_trunk
return: always
- path: .yamato/_templates.yml#test_hdrp_blank_template_OSX_trunk
return: always
- path: .yamato/_templates.yml#pack_hdrp_blank_template_Win_trunk
return: always
- path: .yamato/_templates.yml#pack_hdrp_blank_template_OSX_trunk
return: always
artifacts:
packages:
paths:
Expand All @@ -300,7 +324,8 @@ pre_pack_universal_template_Win_trunk:
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
- .Editor\Unity.exe -projectPath com.unity.template-universal -batchmode -quit -logFile ./Editor.log
dependencies:
- .yamato/_editor_priming.yml#editor:priming:trunk:Win
- path: .yamato/_editor_priming.yml#editor:priming:trunk:Win
return: always
artifacts:
primed:
paths:
Expand Down Expand Up @@ -331,8 +356,10 @@ test_universal_template_Win_trunk:
image: package-ci/win11:v4
flavor: b1.large
dependencies:
- .yamato/_templates.yml#pack_universal_template_Win_trunk
- .yamato/_editor_priming.yml#editor:priming:trunk:Win
- path: .yamato/_templates.yml#pack_universal_template_Win_trunk
return: always
- path: .yamato/_editor_priming.yml#editor:priming:trunk:Win
return: always
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
Expand All @@ -352,7 +379,8 @@ pre_pack_universal_template_OSX_trunk:
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
- .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-universal -batchmode -quit -logFile ./Editor.log
dependencies:
- .yamato/_editor_priming.yml#editor:priming:trunk:OSX
- path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX
return: always
artifacts:
primed:
paths:
Expand Down Expand Up @@ -383,8 +411,10 @@ test_universal_template_OSX_trunk:
image: package-ci/macos-13:v4
flavor: m1.mac
dependencies:
- .yamato/_templates.yml#pack_universal_template_OSX_trunk
- .yamato/_editor_priming.yml#editor:priming:trunk:OSX
- path: .yamato/_templates.yml#pack_universal_template_OSX_trunk
return: always
- path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX
return: always
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
Expand Down Expand Up @@ -422,10 +452,14 @@ publish_universal_template_trunk_dry_run:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci template publish --project-path com.unity.template-universal --dry-run
dependencies:
- .yamato/_templates.yml#test_universal_template_Win_trunk
- .yamato/_templates.yml#test_universal_template_OSX_trunk
- .yamato/_templates.yml#pack_universal_template_Win_trunk
- .yamato/_templates.yml#pack_universal_template_OSX_trunk
- path: .yamato/_templates.yml#test_universal_template_Win_trunk
return: always
- path: .yamato/_templates.yml#test_universal_template_OSX_trunk
return: always
- path: .yamato/_templates.yml#pack_universal_template_Win_trunk
return: always
- path: .yamato/_templates.yml#pack_universal_template_OSX_trunk
return: always
artifacts:
packages:
paths:
Expand All @@ -438,12 +472,18 @@ all_template_ci_trunk:
image: package-ci/win10:v4
flavor: b1.large
dependencies:
- .yamato/_templates.yml#test_hdrp_template_Win_trunk
- .yamato/_templates.yml#test_hdrp_blank_template_Win_trunk
- .yamato/_templates.yml#test_universal_template_Win_trunk
- .yamato/_templates.yml#test_hdrp_template_OSX_trunk
- .yamato/_templates.yml#test_hdrp_blank_template_OSX_trunk
- .yamato/_templates.yml#test_universal_template_OSX_trunk
- path: .yamato/_templates.yml#test_hdrp_template_Win_trunk
rerun: always
- path: .yamato/_templates.yml#test_hdrp_blank_template_Win_trunk
rerun: always
- path: .yamato/_templates.yml#test_universal_template_Win_trunk
rerun: always
- path: .yamato/_templates.yml#test_hdrp_template_OSX_trunk
rerun: always
- path: .yamato/_templates.yml#test_hdrp_blank_template_OSX_trunk
rerun: always
- path: .yamato/_templates.yml#test_universal_template_OSX_trunk
rerun: always
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci package izon -t
Expand Down
22 changes: 11 additions & 11 deletions .yamato/all-postprocessing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ PR_PostProcessing_trunk:
UTR_VERSION: "current"
dependencies:
- path: .yamato/postprocessing-win-dx11.yml#PostProcessing_Win_DX11_Standalone_mono_Linear_trunk
rerun: on_new_revision
rerun: on_new_revis
- path: .yamato/postprocessing-win-dx11.yml#PostProcessing_Win_DX11_playmode_mono_Linear_trunk
rerun: on_new_revision
rerun: always
- path: .yamato/postprocessing-win-dx12.yml#PostProcessing_Win_DX12_playmode_mono_Linear_trunk
rerun: on_new_revision
rerun: always
- path: .yamato/postprocessing-win-vulkan.yml#PostProcessing_Win_Vulkan_playmode_mono_Linear_trunk
rerun: on_new_revision
rerun: always
- path: .yamato/postprocessing-osx-metal.yml#PostProcessing_OSX_Metal_playmode_mono_Linear_trunk
rerun: on_new_revision
rerun: always
- path: .yamato/postprocessing-linux-vulkan.yml#PostProcessing_Linux_Vulkan_Standalone_mono_Linear_trunk
rerun: on_new_revision
rerun: always
- path: .yamato/postprocessing-linux-vulkan.yml#PostProcessing_Linux_Vulkan_playmode_mono_Linear_trunk
rerun: on_new_revision
rerun: always
Extra_PostProcessing_trunk:
name: Extra PostProcessing on trunk
variables:
Expand All @@ -34,9 +34,9 @@ Extra_PostProcessing_trunk:
UTR_VERSION: "current"
dependencies:
- path: .yamato/postprocessing-win-dx12.yml#PostProcessing_Win_DX12_Standalone_mono_Linear_trunk
rerun: on_new_revision
rerun: always
- path: .yamato/postprocessing-win-vulkan.yml#PostProcessing_Win_Vulkan_Standalone_mono_Linear_trunk
rerun: on_new_revision
rerun: always
PostProcessing_trunk:
name: PostProcessing on trunk
variables:
Expand All @@ -45,6 +45,6 @@ PostProcessing_trunk:
UTR_VERSION: "current"
dependencies:
- path: .yamato/all-postprocessing.yml#PR_PostProcessing_trunk
rerun: on_new_revision
rerun: always
- path: .yamato/all-postprocessing.yml#Extra_PostProcessing_trunk
rerun: on_new_revision
rerun: always
Loading
Loading