Skip to content

Commit 2bbc862

Browse files
committed
Modified PR trigger job indentation and created pack jobs on different platforms
1 parent 832c316 commit 2bbc862

File tree

8 files changed

+18
-16
lines changed

8 files changed

+18
-16
lines changed

.yamato/_triggers.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ pull_request_trigger:
1818
triggers:
1919
cancel_old_ci: true
2020
pull_requests:
21-
- targets:
22-
only:
23-
- "develop"
24-
- "develop-2.0.0"
25-
- "/release\/.*/"
21+
- targets:
22+
only:
23+
- "develop"
24+
- "develop-2.0.0"
25+
- "/release\/.*/"
2626

2727

2828
# Run all tests on trunk on nightly basis.

.yamato/code-coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ code_coverage_{{ platform.name }}_{{ editor }}:
2222
paths:
2323
- "upm-ci~/test-results/**/*"
2424
dependencies:
25-
- .yamato/package-pack.yml#package_pack_-_ngo
25+
- .yamato/package-pack.yml#package_pack_-_ngo_{{ platform.name }}
2626
{% endfor -%}
2727
{% endfor -%}

.yamato/desktop-standalone-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ desktop_standalone_build_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
5555
- "artifacts/**/*"
5656

5757
dependencies:
58-
- .yamato/project-pack.yml#project_pack_-_{{ project.name }}
58+
- .yamato/project-pack.yml#project_pack_-_{{ project.name }}_{{ platform.name }}
5959
{% endfor -%}
6060
{% endfor -%}
6161
{% endfor -%}

.yamato/package-pack.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
---
33

44
# Packs Netcode for GameObjects together with performing initial checks.
5-
# For this job no specific platform support and no running Unity instance is required so small agent (as per project.metafile definition) will be used to save resources and speed up the process
6-
{% for platform in small_agent_platform -%}
7-
package_pack_-_ngo:
5+
# For this job no specific platform support and no running Unity instance is required so small agent (as per project.metafile definition) could be used to save resources and speed up the process.
6+
# If everyone adheres to this rule it can create bottlenecks (since everyone would use this machine) so we decided to pack with the same platform as the given job runs on
7+
{% for platform in test_platforms.desktop -%}
8+
package_pack_-_ngo_{{ platform.name }}:
89
name: Package Pack (and x-ray) - NGO [{{ platform.name }}]
910
agent:
1011
type: {{ platform.type }}

.yamato/package-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ package_test_-_ngo_{{ editor }}_{{ platform.name }}:
2121
paths:
2222
- "upm-ci~/test-results/**/*"
2323
dependencies:
24-
- .yamato/package-pack.yml#package_pack_-_ngo
24+
- .yamato/package-pack.yml#package_pack_-_ngo_{{ platform.name }}
2525
{% endfor -%}
2626
{% endfor -%}

.yamato/project-pack.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
---
33

44
# Jobs that iterate through and packs all NGO projects listed (to use in different jobs)
5-
# For this job no specific platform support and no running Unity instance is required so small agent (as per project.metafile definition) will be used to save resources and speed up the process
5+
# For this job no specific platform support and no running Unity instance is required so small agent (as per project.metafile definition) coul be used to save resources and speed up the process
6+
# If everyone adheres to this rule it can create bottlenecks (since everyone would use this machine) so we decided to pack project with the same platform as the given job runs on
67
{% for project in projects.all -%}
7-
{% for platform in small_agent_platform -%}
8-
project_pack_-_{{ project.name }}:
8+
{% for platform in test_platforms.desktop -%}
9+
project_pack_-_{{ project.name }}_{{ platform.name }}:
910
name: Project Pack - {{ project.name }} [{{ platform.name }}]
1011
agent:
1112
type: {{ platform.type }}

.yamato/project-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ test_{{ project.name }}_{{ platform.name }}_{{ editor }}:
2424
paths:
2525
- "upm-ci~/test-results/**/*"
2626
dependencies:
27-
- .yamato/project-pack.yml#project_pack_-_{{ project.name }}
27+
- .yamato/project-pack.yml#project_pack_-_{{ project.name }}_{{ platform.name }}
2828
{% endfor -%}
2929
{% endfor -%}
3030
{% endif -%}

.yamato/project-updated-dependencies-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ updated-dependencies_{{ project.name }}_NGO_{{ platform.name }}_{{ editor }}:
2020
paths:
2121
- "upm-ci~/test-results/**/*"
2222
dependencies:
23-
- path: .yamato/project-pack.yml#project_pack_-_{{ project.name }}
23+
- path: .yamato/project-pack.yml#project_pack_-_{{ project.name }}_{{ platform.name }}
2424
rerun: always
2525
{% endfor -%}
2626
{% endfor -%}

0 commit comments

Comments
 (0)