Skip to content

Commit 24f8efb

Browse files
author
Théo Penavaire
authored
[2021.2] Update the templates pipelines (#5628)
* Remove dependency on pre-pack step * Add templates pipeline to the nightly * Fix previous commit - Add to nightly not ABV * Add exception for the pre-pack step * Bump to correct version * Remove exception message field
1 parent 19d907d commit 24f8efb

File tree

9 files changed

+40
-19
lines changed

9 files changed

+40
-19
lines changed

.yamato/_abv.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ all_project_ci_nightly_2021.2:
4646
rerun: on_new_revision
4747
- path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_2021.2
4848
rerun: on_new_revision
49+
- path: .yamato/_templates.yml#all_template_ci_2021.2
50+
rerun: on_new_revision
4951
- path: .yamato/_abv.yml#General_Checks_2021.2
5052
rerun: on_new_revision
5153
General_Checks_2021.2:
@@ -138,6 +140,8 @@ all_project_ci_nightly_CUSTOM-REVISION:
138140
rerun: on_new_revision
139141
- path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_CUSTOM-REVISION
140142
rerun: on_new_revision
143+
- path: .yamato/_templates.yml#all_template_ci_CUSTOM-REVISION
144+
rerun: on_new_revision
141145
- path: .yamato/_abv.yml#General_Checks_CUSTOM-REVISION
142146
rerun: on_new_revision
143147
General_Checks_CUSTOM-REVISION:

.yamato/_templates.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ pack_hdrp_template_Win_2021.2:
3838
commands:
3939
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
4040
- upm-ci template pack --project-path com.unity.template-hd
41-
dependencies:
42-
- .yamato/_templates.yml#pre_pack_hdrp_template_Win_2021.2
4341
artifacts:
4442
packages:
4543
paths:
@@ -92,8 +90,6 @@ pack_hdrp_template_OSX_2021.2:
9290
commands:
9391
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
9492
- upm-ci template pack --project-path com.unity.template-hd
95-
dependencies:
96-
- .yamato/_templates.yml#pre_pack_hdrp_template_OSX_2021.2
9793
artifacts:
9894
packages:
9995
paths:
@@ -184,8 +180,6 @@ pack_hdrp_template_Win_CUSTOM-REVISION:
184180
commands:
185181
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
186182
- upm-ci template pack --project-path com.unity.template-hd
187-
dependencies:
188-
- .yamato/_templates.yml#pre_pack_hdrp_template_Win_CUSTOM-REVISION
189183
artifacts:
190184
packages:
191185
paths:
@@ -238,8 +232,6 @@ pack_hdrp_template_OSX_CUSTOM-REVISION:
238232
commands:
239233
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
240234
- upm-ci template pack --project-path com.unity.template-hd
241-
dependencies:
242-
- .yamato/_templates.yml#pre_pack_hdrp_template_OSX_CUSTOM-REVISION
243235
artifacts:
244236
packages:
245237
paths:
@@ -330,8 +322,6 @@ pack_universal_template_Win_2021.2:
330322
commands:
331323
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
332324
- upm-ci template pack --project-path com.unity.template-universal
333-
dependencies:
334-
- .yamato/_templates.yml#pre_pack_universal_template_Win_2021.2
335325
artifacts:
336326
packages:
337327
paths:
@@ -384,8 +374,6 @@ pack_universal_template_OSX_2021.2:
384374
commands:
385375
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
386376
- upm-ci template pack --project-path com.unity.template-universal
387-
dependencies:
388-
- .yamato/_templates.yml#pre_pack_universal_template_OSX_2021.2
389377
artifacts:
390378
packages:
391379
paths:
@@ -476,8 +464,6 @@ pack_universal_template_Win_CUSTOM-REVISION:
476464
commands:
477465
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
478466
- upm-ci template pack --project-path com.unity.template-universal
479-
dependencies:
480-
- .yamato/_templates.yml#pre_pack_universal_template_Win_CUSTOM-REVISION
481467
artifacts:
482468
packages:
483469
paths:
@@ -530,8 +516,6 @@ pack_universal_template_OSX_CUSTOM-REVISION:
530516
commands:
531517
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
532518
- upm-ci template pack --project-path com.unity.template-universal
533-
dependencies:
534-
- .yamato/_templates.yml#pre_pack_universal_template_OSX_CUSTOM-REVISION
535519
artifacts:
536520
packages:
537521
paths:

.yamato/config/_templates.metafile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ templates:
88
- vfx
99
- config
1010
- hdrp
11-
include_prepack_step: True
11+
include_prepack_step: False
1212
- name: Universal Template
1313
id: universal_template
1414
packagename: com.unity.template-universal
1515
dependencies:
1616
- core
1717
- shadergraph
1818
- universal
19-
include_prepack_step: True
19+
include_prepack_step: False
2020
platforms:
2121
- name: Win
2222
- name: OSX

.yamato/config/abv.metafile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
- .yamato/all-vfx.yml#Nightly_VFX_<TRACK>
2121
- .yamato/all-urp.yml#Nightly_URP_<TRACK>
2222
- .yamato/all-shadergraph.yml#Nightly_ShaderGraph_<TRACK>
23+
- .yamato/_templates.yml#all_template_ci_<TRACK>
2324
- <PROJECT_ALL_YML_FILE>#General_Checks_<TRACK>
2425
triggers:
2526
recurring:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
74cc43c599d67cc4e66f846043f563ba4f477eed
1+
83513b1518a8c43db2e2a009ca37e8a7f55c5196
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"ErrorExceptions": [
3+
{
4+
"ValidationTest": "Primed Library Validation",
5+
"PackageVersion": "12.2.0"
6+
}
7+
],
8+
"WarningExceptions": []
9+
}

com.unity.template-hd/Packages/com.unity.template.hd/ValidationExceptions.json.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"ErrorExceptions": [
3+
{
4+
"ValidationTest": "Primed Library Validation",
5+
"PackageVersion": "12.1.0"
6+
}
7+
],
8+
"WarningExceptions": []
9+
}

com.unity.template-universal/Packages/com.unity.template.universal/ValidationExceptions.json.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)