Skip to content

Commit 76c458e

Browse files
authored
[22.3] Always rerun editor priming (#8095)
Set rerun:always
1 parent 6171b1d commit 76c458e

File tree

11 files changed

+97
-719
lines changed

11 files changed

+97
-719
lines changed

.yamato/_abv.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ graphics_repo_nightly_2022.3:
1717
frequency: 23 ? * 7 # At 11pm every Saturday
1818
dependencies:
1919
- path: .yamato/_templates.yml#all_template_ci_2022.3
20-
rerun: on_new_revision
20+
rerun: always

.yamato/_templates.yml

Lines changed: 96 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ pre_pack_hdrp_template_Win_2022.3:
1616
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
1717
- .Editor\Unity.exe -projectPath com.unity.template-hd -batchmode -quit -logFile ./Editor.log
1818
dependencies:
19-
- .yamato/_editor_priming.yml#editor:priming:2022.3:Win
19+
- path: .yamato/_editor_priming.yml#editor:priming:2022.3:Win
20+
rerun: always
2021
artifacts:
2122
primed:
2223
paths:
@@ -47,8 +48,10 @@ test_hdrp_template_Win_2022.3:
4748
image: package-ci/win11:v4
4849
flavor: b1.large
4950
dependencies:
50-
- .yamato/_templates.yml#pack_hdrp_template_Win_2022.3
51-
- .yamato/_editor_priming.yml#editor:priming:2022.3:Win
51+
- path: .yamato/_templates.yml#pack_hdrp_template_Win_2022.3
52+
rerun: always
53+
- path: .yamato/_editor_priming.yml#editor:priming:2022.3:Win
54+
rerun: always
5255
commands:
5356
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
5457
- choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
@@ -68,7 +71,8 @@ pre_pack_hdrp_template_OSX_2022.3:
6871
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
6972
- .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-hd -batchmode -quit -logFile ./Editor.log
7073
dependencies:
71-
- .yamato/_editor_priming.yml#editor:priming:2022.3:OSX
74+
- path: .yamato/_editor_priming.yml#editor:priming:2022.3:OSX
75+
rerun: always
7276
artifacts:
7377
primed:
7478
paths:
@@ -99,8 +103,10 @@ test_hdrp_template_OSX_2022.3:
99103
image: package-ci/macos-13:v4
100104
flavor: m1.mac
101105
dependencies:
102-
- .yamato/_templates.yml#pack_hdrp_template_OSX_2022.3
103-
- .yamato/_editor_priming.yml#editor:priming:2022.3:OSX
106+
- path: .yamato/_templates.yml#pack_hdrp_template_OSX_2022.3
107+
rerun: always
108+
- path: .yamato/_editor_priming.yml#editor:priming:2022.3:OSX
109+
rerun: always
104110
commands:
105111
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
106112
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
@@ -119,10 +125,14 @@ publish_hdrp_template_2022.3:
119125
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
120126
- upm-ci template publish --project-path com.unity.template-hd
121127
dependencies:
122-
- .yamato/_templates.yml#test_hdrp_template_Win_2022.3
123-
- .yamato/_templates.yml#test_hdrp_template_OSX_2022.3
124-
- .yamato/_templates.yml#pack_hdrp_template_Win_2022.3
125-
- .yamato/_templates.yml#pack_hdrp_template_OSX_2022.3
128+
- path: .yamato/_templates.yml#test_hdrp_template_Win_2022.3
129+
rerun: always
130+
- path: .yamato/_templates.yml#test_hdrp_template_OSX_2022.3
131+
rerun: always
132+
- path: .yamato/_templates.yml#pack_hdrp_template_Win_2022.3
133+
rerun: always
134+
- path: .yamato/_templates.yml#pack_hdrp_template_OSX_2022.3
135+
rerun: always
126136
artifacts:
127137
packages:
128138
paths:
@@ -138,10 +148,14 @@ publish_hdrp_template_2022.3_dry_run:
138148
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
139149
- upm-ci template publish --project-path com.unity.template-hd --dry-run
140150
dependencies:
141-
- .yamato/_templates.yml#test_hdrp_template_Win_2022.3
142-
- .yamato/_templates.yml#test_hdrp_template_OSX_2022.3
143-
- .yamato/_templates.yml#pack_hdrp_template_Win_2022.3
144-
- .yamato/_templates.yml#pack_hdrp_template_OSX_2022.3
151+
- path: .yamato/_templates.yml#test_hdrp_template_Win_2022.3
152+
rerun: always
153+
- path: .yamato/_templates.yml#test_hdrp_template_OSX_2022.3
154+
rerun: always
155+
- path: .yamato/_templates.yml#pack_hdrp_template_Win_2022.3
156+
rerun: always
157+
- path: .yamato/_templates.yml#pack_hdrp_template_OSX_2022.3
158+
rerun: always
145159
artifacts:
146160
packages:
147161
paths:
@@ -158,7 +172,8 @@ pre_pack_hdrp_blank_template_Win_2022.3:
158172
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
159173
- .Editor\Unity.exe -projectPath com.unity.template.hdrp-blank -batchmode -quit -logFile ./Editor.log
160174
dependencies:
161-
- .yamato/_editor_priming.yml#editor:priming:2022.3:Win
175+
- path: .yamato/_editor_priming.yml#editor:priming:2022.3:Win
176+
rerun: always
162177
artifacts:
163178
primed:
164179
paths:
@@ -189,8 +204,10 @@ test_hdrp_blank_template_Win_2022.3:
189204
image: package-ci/win11:v4
190205
flavor: b1.large
191206
dependencies:
192-
- .yamato/_templates.yml#pack_hdrp_blank_template_Win_2022.3
193-
- .yamato/_editor_priming.yml#editor:priming:2022.3:Win
207+
- path: .yamato/_templates.yml#pack_hdrp_blank_template_Win_2022.3
208+
rerun: always
209+
- path: .yamato/_editor_priming.yml#editor:priming:2022.3:Win
210+
rerun: always
194211
commands:
195212
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
196213
- choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
@@ -210,7 +227,8 @@ pre_pack_hdrp_blank_template_OSX_2022.3:
210227
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
211228
- .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template.hdrp-blank -batchmode -quit -logFile ./Editor.log
212229
dependencies:
213-
- .yamato/_editor_priming.yml#editor:priming:2022.3:OSX
230+
- path: .yamato/_editor_priming.yml#editor:priming:2022.3:OSX
231+
rerun: always
214232
artifacts:
215233
primed:
216234
paths:
@@ -241,8 +259,10 @@ test_hdrp_blank_template_OSX_2022.3:
241259
image: package-ci/macos-13:v4
242260
flavor: m1.mac
243261
dependencies:
244-
- .yamato/_templates.yml#pack_hdrp_blank_template_OSX_2022.3
245-
- .yamato/_editor_priming.yml#editor:priming:2022.3:OSX
262+
- path: .yamato/_templates.yml#pack_hdrp_blank_template_OSX_2022.3
263+
rerun: always
264+
- path: .yamato/_editor_priming.yml#editor:priming:2022.3:OSX
265+
rerun: always
246266
commands:
247267
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
248268
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
@@ -261,10 +281,14 @@ publish_hdrp_blank_template_2022.3:
261281
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
262282
- upm-ci template publish --project-path com.unity.template.hdrp-blank
263283
dependencies:
264-
- .yamato/_templates.yml#test_hdrp_blank_template_Win_2022.3
265-
- .yamato/_templates.yml#test_hdrp_blank_template_OSX_2022.3
266-
- .yamato/_templates.yml#pack_hdrp_blank_template_Win_2022.3
267-
- .yamato/_templates.yml#pack_hdrp_blank_template_OSX_2022.3
284+
- path: .yamato/_templates.yml#test_hdrp_blank_template_Win_2022.3
285+
rerun: always
286+
- path: .yamato/_templates.yml#test_hdrp_blank_template_OSX_2022.3
287+
rerun: always
288+
- path: .yamato/_templates.yml#pack_hdrp_blank_template_Win_2022.3
289+
rerun: always
290+
- path: .yamato/_templates.yml#pack_hdrp_blank_template_OSX_2022.3
291+
rerun: always
268292
artifacts:
269293
packages:
270294
paths:
@@ -280,10 +304,14 @@ publish_hdrp_blank_template_2022.3_dry_run:
280304
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
281305
- upm-ci template publish --project-path com.unity.template.hdrp-blank --dry-run
282306
dependencies:
283-
- .yamato/_templates.yml#test_hdrp_blank_template_Win_2022.3
284-
- .yamato/_templates.yml#test_hdrp_blank_template_OSX_2022.3
285-
- .yamato/_templates.yml#pack_hdrp_blank_template_Win_2022.3
286-
- .yamato/_templates.yml#pack_hdrp_blank_template_OSX_2022.3
307+
- path: .yamato/_templates.yml#test_hdrp_blank_template_Win_2022.3
308+
rerun: always
309+
- path: .yamato/_templates.yml#test_hdrp_blank_template_OSX_2022.3
310+
rerun: always
311+
- path: .yamato/_templates.yml#pack_hdrp_blank_template_Win_2022.3
312+
rerun: always
313+
- path: .yamato/_templates.yml#pack_hdrp_blank_template_OSX_2022.3
314+
rerun: always
287315
artifacts:
288316
packages:
289317
paths:
@@ -300,7 +328,8 @@ pre_pack_universal_template_Win_2022.3:
300328
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
301329
- .Editor\Unity.exe -projectPath com.unity.template-universal -batchmode -quit -logFile ./Editor.log
302330
dependencies:
303-
- .yamato/_editor_priming.yml#editor:priming:2022.3:Win
331+
- path: .yamato/_editor_priming.yml#editor:priming:2022.3:Win
332+
rerun: always
304333
artifacts:
305334
primed:
306335
paths:
@@ -331,8 +360,10 @@ test_universal_template_Win_2022.3:
331360
image: package-ci/win11:v4
332361
flavor: b1.large
333362
dependencies:
334-
- .yamato/_templates.yml#pack_universal_template_Win_2022.3
335-
- .yamato/_editor_priming.yml#editor:priming:2022.3:Win
363+
- path: .yamato/_templates.yml#pack_universal_template_Win_2022.3
364+
rerun: always
365+
- path: .yamato/_editor_priming.yml#editor:priming:2022.3:Win
366+
rerun: always
336367
commands:
337368
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
338369
- choco install unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
@@ -352,7 +383,8 @@ pre_pack_universal_template_OSX_2022.3:
352383
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
353384
- .Editor/Unity.app/Contents/MacOS/Unity -projectPath com.unity.template-universal -batchmode -quit -logFile ./Editor.log
354385
dependencies:
355-
- .yamato/_editor_priming.yml#editor:priming:2022.3:OSX
386+
- path: .yamato/_editor_priming.yml#editor:priming:2022.3:OSX
387+
rerun: always
356388
artifacts:
357389
primed:
358390
paths:
@@ -383,8 +415,10 @@ test_universal_template_OSX_2022.3:
383415
image: package-ci/macos-13:v4
384416
flavor: m1.mac
385417
dependencies:
386-
- .yamato/_templates.yml#pack_universal_template_OSX_2022.3
387-
- .yamato/_editor_priming.yml#editor:priming:2022.3:OSX
418+
- path: .yamato/_templates.yml#pack_universal_template_OSX_2022.3
419+
rerun: always
420+
- path: .yamato/_editor_priming.yml#editor:priming:2022.3:OSX
421+
rerun: always
388422
commands:
389423
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
390424
- unity-downloader-cli --source-file unity_revision.txt -c editor --wait --published-only
@@ -403,10 +437,14 @@ publish_universal_template_2022.3:
403437
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
404438
- upm-ci template publish --project-path com.unity.template-universal
405439
dependencies:
406-
- .yamato/_templates.yml#test_universal_template_Win_2022.3
407-
- .yamato/_templates.yml#test_universal_template_OSX_2022.3
408-
- .yamato/_templates.yml#pack_universal_template_Win_2022.3
409-
- .yamato/_templates.yml#pack_universal_template_OSX_2022.3
440+
- path: .yamato/_templates.yml#test_universal_template_Win_2022.3
441+
rerun: always
442+
- path: .yamato/_templates.yml#test_universal_template_OSX_2022.3
443+
rerun: always
444+
- path: .yamato/_templates.yml#pack_universal_template_Win_2022.3
445+
rerun: always
446+
- path: .yamato/_templates.yml#pack_universal_template_OSX_2022.3
447+
rerun: always
410448
artifacts:
411449
packages:
412450
paths:
@@ -422,10 +460,14 @@ publish_universal_template_2022.3_dry_run:
422460
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
423461
- upm-ci template publish --project-path com.unity.template-universal --dry-run
424462
dependencies:
425-
- .yamato/_templates.yml#test_universal_template_Win_2022.3
426-
- .yamato/_templates.yml#test_universal_template_OSX_2022.3
427-
- .yamato/_templates.yml#pack_universal_template_Win_2022.3
428-
- .yamato/_templates.yml#pack_universal_template_OSX_2022.3
463+
- path: .yamato/_templates.yml#test_universal_template_Win_2022.3
464+
rerun: always
465+
- path: .yamato/_templates.yml#test_universal_template_OSX_2022.3
466+
rerun: always
467+
- path: .yamato/_templates.yml#pack_universal_template_Win_2022.3
468+
rerun: always
469+
- path: .yamato/_templates.yml#pack_universal_template_OSX_2022.3
470+
rerun: always
429471
artifacts:
430472
packages:
431473
paths:
@@ -438,12 +480,18 @@ all_template_ci_2022.3:
438480
image: package-ci/win10:v4
439481
flavor: b1.large
440482
dependencies:
441-
- .yamato/_templates.yml#test_hdrp_template_Win_2022.3
442-
- .yamato/_templates.yml#test_hdrp_blank_template_Win_2022.3
443-
- .yamato/_templates.yml#test_universal_template_Win_2022.3
444-
- .yamato/_templates.yml#test_hdrp_template_OSX_2022.3
445-
- .yamato/_templates.yml#test_hdrp_blank_template_OSX_2022.3
446-
- .yamato/_templates.yml#test_universal_template_OSX_2022.3
483+
- path: .yamato/_templates.yml#test_hdrp_template_Win_2022.3
484+
rerun: always
485+
- path: .yamato/_templates.yml#test_hdrp_blank_template_Win_2022.3
486+
rerun: always
487+
- path: .yamato/_templates.yml#test_universal_template_Win_2022.3
488+
rerun: always
489+
- path: .yamato/_templates.yml#test_hdrp_template_OSX_2022.3
490+
rerun: always
491+
- path: .yamato/_templates.yml#test_hdrp_blank_template_OSX_2022.3
492+
rerun: always
493+
- path: .yamato/_templates.yml#test_universal_template_OSX_2022.3
494+
rerun: always
447495
commands:
448496
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
449497
- upm-ci package izon -t

0 commit comments

Comments
 (0)