Skip to content

[Yamato] Exclude docs in expression triggers #3254

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.

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

Merged
merged 8 commits into from
Jan 25, 2021
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
2 changes: 1 addition & 1 deletion .yamato/_abv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ all_project_ci_trunk:
- path: .yamato/all-vfx_urp.yml#PR_VFX_URP_trunk
rerun: on-new-revision
triggers:
expression: pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.core/**/*"]
expression: pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.core/**/*"] AND NOT pull_request.push.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]
all_project_ci_nightly_trunk:
name: _Nightly ABV against trunk
dependencies:
Expand Down
4 changes: 1 addition & 3 deletions .yamato/_projectcontext.yml
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ all_package_ci_project_trunk:
- .yamato/_projectcontext.yml#test_all_project_macos_trunk
- .yamato/_projectcontext.yml#test_all_project_macos_min_editor
triggers:
expression: push.branch eq "master" AND NOT pull_request.draft
expression: pull_request.target eq "master" AND NOT pull_request.draft
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 All @@ -396,8 +396,6 @@ all_package_ci_project_CUSTOM-REVISION:
- .yamato/_projectcontext.yml#test_all_project_macos_CUSTOM-REVISION
variables:
CUSTOM_REVISION: custom_revision_not_set
triggers:
expression: push.branch eq "master" AND NOT pull_request.draft
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
2 changes: 1 addition & 1 deletion .yamato/all-hdrp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ PR_HDRP_trunk:
- path: .yamato/all-vfx_hdrp.yml#PR_VFX_HDRP_trunk
rerun: on-new-revision
triggers:
expression: pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.high-definition/**/*", "com.unity.render-pipelines.high-definition-config/**/*", "TestProjects/HDRP_Tests/**/*"]
expression: pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.high-definition/**/*", "com.unity.render-pipelines.high-definition-config/**/*", "TestProjects/HDRP_Tests/**/*"] AND NOT pull_request.push.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]
variables:
UTR_VERSION: "current"
TEST_FILTER: .*
Expand Down
2 changes: 1 addition & 1 deletion .yamato/all-shadergraph.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ PR_ShaderGraph_trunk:
- path: .yamato/all-shadergraph_stereo.yml#PR_ShaderGraph_Stereo_trunk
rerun: on-new-revision
triggers:
expression: pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.shadergraph/**/*", "TestProjects/ShaderGraph/**/*"]
expression: pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.shadergraph/**/*", "TestProjects/ShaderGraph/**/*"] AND NOT pull_request.push.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]
variables:
UTR_VERSION: "current"
TEST_FILTER: .*
Expand Down
2 changes: 1 addition & 1 deletion .yamato/all-universal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ PR_Universal_trunk:
- path: .yamato/all-shadergraph.yml#PR_ShaderGraph_trunk
rerun: on-new-revision
triggers:
expression: pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.universal/**/*", "TestProjects/UniversalGraphicsTest/**/*"]
expression: pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.universal/**/*", "TestProjects/UniversalGraphicsTest/**/*"] AND NOT pull_request.push.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]
variables:
UTR_VERSION: "current"
TEST_FILTER: .*
Expand Down
2 changes: 1 addition & 1 deletion .yamato/all-vfx_hdrp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ PR_VFX_HDRP_trunk:
- path: .yamato/vfx_hdrp-win-dx12.yml#VFX_HDRP_Win_DX12_Standalone_cache_mono_Linear_trunk
rerun: on-new-revision
triggers:
expression: pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.visualeffectgraph/**/*", "TestProjects/VisualEffectGraph_HDRP/**/*"]
expression: pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.visualeffectgraph/**/*", "TestProjects/VisualEffectGraph_HDRP/**/*"] AND NOT pull_request.push.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]
variables:
UTR_VERSION: "current"
TEST_FILTER: .*
Expand Down
2 changes: 1 addition & 1 deletion .yamato/all-vfx_urp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ PR_VFX_URP_trunk:
- path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_Standalone_cache_mono_Linear_trunk
rerun: on-new-revision
triggers:
expression: pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.visualeffectgraph/**/*", "TestProjects/VisualEffectGraph_URP/**/*"]
expression: pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.visualeffectgraph/**/*", "TestProjects/VisualEffectGraph_URP/**/*"] AND NOT pull_request.push.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]
variables:
UTR_VERSION: "current"
TEST_FILTER: .*
Expand Down
2 changes: 1 addition & 1 deletion .yamato/config/_abv.metafile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ abv: # specify the editor versions for which to create the expression trigger fo
- name: VFX_HDRP
- name: VFX_URP
expression_trigger:
expression: 'pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.core/**/*"]'
expression: 'pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.core/**/*"] AND NOT pull_request.push.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]'
build_configs:
- mono
- il2cpp
Expand Down
2 changes: 1 addition & 1 deletion .yamato/config/hdrp.metafile
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ test_platforms:
- [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true"
- [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true"
expression_trigger:
expression: 'pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.high-definition/**/*", "com.unity.render-pipelines.high-definition-config/**/*", "TestProjects/HDRP_Tests/**/*"]'
expression: 'pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.high-definition/**/*", "com.unity.render-pipelines.high-definition-config/**/*", "TestProjects/HDRP_Tests/**/*"] AND NOT pull_request.push.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]'
platforms:
- name: Win
apis:
Expand Down
2 changes: 1 addition & 1 deletion .yamato/config/shadergraph.metafile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ test_platforms:
- [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true"
- [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true"
expression_trigger:
expression: 'pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.shadergraph/**/*", "TestProjects/ShaderGraph/**/*"]'
expression: 'pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.shadergraph/**/*", "TestProjects/ShaderGraph/**/*"] AND NOT pull_request.push.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]'
platforms:
- name: Win
apis:
Expand Down
2 changes: 1 addition & 1 deletion .yamato/config/universal.metafile
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ test_platforms:
- [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true"
- [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true"
expression_trigger:
expression: 'pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.universal/**/*", "TestProjects/UniversalGraphicsTest/**/*"]'
expression: 'pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.universal/**/*", "TestProjects/UniversalGraphicsTest/**/*"] AND NOT pull_request.push.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]'
platforms:
- name: Win
apis:
Expand Down
2 changes: 1 addition & 1 deletion .yamato/config/vfx_hdrp.metafile
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ test_platforms:
- [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true"
- [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true"
expression_trigger:
expression: 'pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.visualeffectgraph/**/*", "TestProjects/VisualEffectGraph_HDRP/**/*"]'
expression: 'pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.visualeffectgraph/**/*", "TestProjects/VisualEffectGraph_HDRP/**/*"] AND NOT pull_request.push.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]'
platforms:
- name: Win
apis:
Expand Down
2 changes: 1 addition & 1 deletion .yamato/config/vfx_urp.metafile
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ test_platforms:
- [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true"
# - type: editmode
expression_trigger:
expression: 'pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.visualeffectgraph/**/*", "TestProjects/VisualEffectGraph_URP/**/*"]'
expression: 'pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.visualeffectgraph/**/*", "TestProjects/VisualEffectGraph_URP/**/*"] AND NOT pull_request.push.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]'
platforms:
- name: Win
apis:
Expand Down
3 changes: 2 additions & 1 deletion .yamato/ruamel/jobs/packages/project_test_all.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ def get_job_definition(self, packages, agent, platforms, target_branch, editor):
job.set_agent(agent)
job.add_dependencies(dependencies)
job.add_var_custom_revision(editor["track"])
job.set_trigger_on_expression(f'push.branch eq "{target_branch}" AND NOT pull_request.draft')
if editor["track"] != "CUSTOM-REVISION":
job.set_trigger_on_expression(f'pull_request.target eq "{target_branch}" AND NOT pull_request.draft')
job.add_commands([
f'npm install upm-ci-utils@stable -g --registry {NPM_UPMCI_INSTALL_URL}',
f'upm-ci package izon -t',
Expand Down