Skip to content

Commit 8351074

Browse files
authored
chore: Remove unnecessary Publish/Promote configs and update dependencies (#1888)
* Remove unnecessary publish and promote configs for minimalproject * update dependencies
1 parent d220adf commit 8351074

File tree

3 files changed

+12
-57
lines changed

3 files changed

+12
-57
lines changed

.yamato/project-promotion.yml

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{% metadata_file .yamato/project.metafile %}
22
---
33
{% for project in projects -%}
4+
{% if project.publish == "true" -%}
45
{% for package in project.packages -%}
56
# Validation job for package {{ package.name }}, only using the first entry in the
67
# platform and editor meta data
@@ -39,7 +40,7 @@ promote_{{ project.name }}_{{ package.name }}:
3940
- "upm-ci~/packages/*.tgz"
4041
dependencies:
4142
- .yamato/project-pack.yml#pack_{{ project.name }}
42-
- .yamato/project-promotion.yml#promotion_validate_{{ project.name }}_{{ package.name }}_{{ test_platforms.first.name }}_{{ validation_editor }}
43+
- .yamato/project-promotion.yml#promote_{{ project.name }}_{{ package.name }}_dry_run
4344

4445
promote_{{ project.name }}_{{ package.name }}_dry_run:
4546
name: Promote Project {{ project.name }} - Package {{ package.name }} to Production (dry-run)
@@ -58,26 +59,9 @@ promote_{{ project.name }}_{{ package.name }}_dry_run:
5859
- "upm-ci~/packages/*.tgz"
5960
dependencies:
6061
- .yamato/project-pack.yml#pack_{{ project.name }}
62+
- .yamato/project-publish.yml#publish_{{ project.name }}_{{ package.name }}
6163
- .yamato/project-promotion.yml#promotion_validate_{{ project.name }}_{{ package.name }}_{{ test_platforms.first.name }}_{{ validation_editor }}
6264

6365
{% endfor -%}
64-
65-
promote_{{ project.name }}:
66-
name: Promote ALL {{ project.name }} packages to Production
67-
agent:
68-
type: Unity::VM
69-
image: package-ci/win10:stable
70-
flavor: b1.small
71-
variables:
72-
UPMCI_PROMOTION: 1
73-
commands:
74-
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
75-
- upm-ci project promote --project-path {{ project.path }}
76-
artifacts:
77-
artifacts:
78-
paths:
79-
- "upm-ci~/packages/*.tgz"
80-
dependencies:
81-
- .yamato/project-pack.yml#pack_{{ project.name }}
82-
- .yamato/project-promotion.yml#promotion_validate_{{ project.packages.first.name }}_{{ test_platforms.first.name }}_{{ validation_editor }}
66+
{% endif -%}
8367
{% endfor -%}

.yamato/project-publish.yml

Lines changed: 3 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{% metadata_file .yamato/project.metafile %}
22
---
33
{% for project in projects -%}
4+
{% if project.publish == "true" -%}
45
{% for package in project.packages -%}
56
publish_{{ project.name }}_{{ package.name }}:
67
name: Publish Project {{project.name }} - Package {{ package.name }} to Internal Registry
@@ -17,7 +18,7 @@ publish_{{ project.name }}_{{ package.name }}:
1718
- "upm-ci~/packages/*.tgz"
1819
dependencies:
1920
- .yamato/project-pack.yml#pack_{{ project.name }}
20-
- .yamato/project-tests.yml#validate_{{ package.name }}_{{ test_platforms.first.name }}_{{ validation_editor }}
21+
- .yamato/project-publish.yml#publish_{{ project.name }}_{{ package.name }}_dry_run
2122

2223
publish_{{ project.name }}_{{ package.name }}_dry_run:
2324
name: Publish Project {{project.name }} - Package {{ package.name }} to Internal Registry (dry-run)
@@ -37,39 +38,5 @@ publish_{{ project.name }}_{{ package.name }}_dry_run:
3738
- .yamato/project-tests.yml#validate_{{ package.name }}_{{ test_platforms.first.name }}_{{ validation_editor }}
3839

3940
{% endfor -%}
40-
41-
publish_{{ project.name }}:
42-
name: Publish ALL {{ project.name }} packages to Internal Registry
43-
agent:
44-
type: Unity::VM
45-
image: package-ci/win10:stable
46-
flavor: b1.large
47-
commands:
48-
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
49-
- upm-ci project publish --project-path {{ project.path }}
50-
artifacts:
51-
artifacts:
52-
paths:
53-
- "upm-ci~/packages/*.tgz"
54-
dependencies:
55-
- .yamato/project-pack.yml#pack_{{ project.name }}
56-
- .yamato/_run-all.yml#run_all_tests
57-
58-
publish_{{ project.name }}_dry_run:
59-
name: Publish ALL {{ project.name }} packages to Internal Registry (dry-run)
60-
agent:
61-
type: Unity::VM
62-
image: package-ci/win10:stable
63-
flavor: b1.large
64-
commands:
65-
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
66-
- upm-ci project publish --project-path {{ project.path }} --dry-run
67-
artifacts:
68-
artifacts:
69-
paths:
70-
- "upm-ci~/packages/*.tgz"
71-
dependencies:
72-
- .yamato/project-pack.yml#pack_{{ project.name }}
73-
- .yamato/_run-all.yml#run_all_tests
74-
41+
{% endif -%}
7542
{% endfor -%}

.yamato/project.metafile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,19 @@ projects:
3434
- name: testproject
3535
path: testproject
3636
validate: true
37+
publish: true
3738
# Packages within a project that will be tested
3839
packages:
3940
- name: com.unity.netcode.gameobjects
4041
path: com.unity.netcode.gameobjects
4142
test_editors:
42-
- 2021.2
4343
- 2020.3
44+
- 2021.2
4445
- trunk
4546
- name: minimalproject
4647
path: minimalproject
48+
validate: false
49+
publish: false
4750
packages:
4851
- name: com.unity.netcode.gameobjects
4952
path: com.unity.netcode.gameobjects
@@ -52,6 +55,7 @@ projects:
5255
- name: testproject-tools-integration
5356
path: testproject-tools-integration
5457
validate: false
58+
publish: false
5559
test_editors:
5660
- 2021.2
5761
- trunk

0 commit comments

Comments
 (0)