Skip to content

Commit 6b042c2

Browse files
authored
NEW: add option to manually choose arbitrary editor version for CI jobs (#2099)
1 parent db232e3 commit 6b042c2

File tree

1 file changed

+24
-8
lines changed

1 file changed

+24
-8
lines changed

.yamato/upm-ci.yml

+24-8
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
type: {{ platform.type }}
1111
image: {{ platform.image }}
1212
flavor: {{ platform.flavor }}
13+
variables:
14+
EDITOR_VERSION: {{ editor.version }}
1315
commands:
1416
- {{ utr_install_win }}
1517
- {{ upm_ci_install }}
@@ -23,12 +25,12 @@
2325
- move /Y .\Assets\Samples.meta .\Packages\com.unity.inputsystem
2426
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
2527
# Run upm-ci verification tests as well as tests contained in the package.
26-
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }}
28+
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u %EDITOR_VERSION%
2729
{% if platform.name == "win" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem"
2830
--extra-utr-arg="--coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package" {% endif %}
2931
{% if platform.installscript %}
3032
- {{ unity_downloader_install }}
31-
- {{ platform.installscript }} {{ editor.version }}
33+
- {{ platform.installscript }} %EDITOR_VERSION%
3234
{% endif %}
3335
# ADBv2 on 2019.4 causes the test runner to not start on initial import when the
3436
# samples are in the package. Move the samples back into the project.
@@ -54,6 +56,8 @@
5456
type: {{ platform.type }}
5557
image: {{ platform.image }}
5658
flavor: {{ platform.flavor }}
59+
variables:
60+
EDITOR_VERSION: {{ editor.version }}
5761
commands:
5862
- {{ utr_install_nix }}
5963
- {{ upm_ci_install }}
@@ -66,10 +70,10 @@
6670
- mv ./Assets/Samples.meta ./Packages/com.unity.inputsystem
6771
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
6872
# Run upm-ci verification tests as well as tests contained in the package.
69-
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }} {% if platform.name == "mac" or platform.name == "linux" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --extra-utr-arg="--coverage-results-path={{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Package" {% endif %}
73+
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u $EDITOR_VERSION {% if platform.name == "mac" or platform.name == "linux" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --extra-utr-arg="--coverage-results-path={{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Package" {% endif %}
7074
{% if platform.installscript %}
7175
- {{ unity_downloader_install }}
72-
- {{ platform.installscript }} {{ editor.version }}
76+
- {{ platform.installscript }} $EDITOR_VERSION
7377
{% endif %}
7478
# ADBv2 on 2019.4 causes the test runner to not start on initial import when the
7579
# samples are in the package. Move the samples back into the project.
@@ -96,10 +100,12 @@ build_ios_{{ editor.version }}_{{ category.name }}:
96100
type: Unity::VM::osx
97101
image: {{ ios_and_tvos_macos_bokken_image }}
98102
flavor: b1.large
103+
variables:
104+
EDITOR_VERSION: {{ editor.version }}
99105
commands:
100106
- {{ utr_install_nix }}
101107
- {{ unity_downloader_install }}
102-
- unity-downloader-cli -c Editor -c iOS -u {{ editor.version }} --fast --wait
108+
- unity-downloader-cli -c Editor -c iOS -u $EDITOR_VERSION --fast --wait
103109
- ./utr --suite=playmode {% if category.name == "performance" %} --category=Performance {% endif %} --platform=iOS --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --build-only --report-performance-data --performance-project-id=InputSystem
104110
after:
105111
- {{ instabilities_install_nix }}
@@ -119,6 +125,8 @@ run_ios_{{ editor.version }}_{{ category.name }}:
119125
image: {{ ios_and_tvos_macos_bokken_image }}
120126
model: SE
121127
flavor: b1.medium
128+
variables:
129+
EDITOR_VERSION: {{ editor.version }}
122130
skip_checkout: true
123131
dependencies:
124132
- .yamato/upm-ci.yml#build_ios_{{ editor.version }}_{{ category.name }}
@@ -140,10 +148,12 @@ build_tvos_{{ editor.version }}:
140148
type: Unity::VM::osx
141149
image: {{ ios_and_tvos_macos_bokken_image }}
142150
flavor: b1.large
151+
variables:
152+
EDITOR_VERSION: {{ editor.version }}
143153
commands:
144154
- {{ utr_install_nix }}
145155
- {{ unity_downloader_install }}
146-
- unity-downloader-cli -c Editor -c AppleTV -u {{ editor.version }} --fast --wait
156+
- unity-downloader-cli -c Editor -c AppleTV -u $EDITOR_VERSION --fast --wait
147157
- ./utr --suite=playmode --platform=tvOS --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --build-only --report-performance-data --performance-project-id=InputSystem
148158
after:
149159
- {{ instabilities_install_nix }}
@@ -162,6 +172,8 @@ run_tvos_{{ editor.version }}:
162172
type: Unity::mobile::appletv
163173
image: {{ ios_and_tvos_macos_bokken_image }}
164174
flavor: b1.medium
175+
variables:
176+
EDITOR_VERSION: {{ editor.version }}
165177
skip_checkout: true
166178
dependencies:
167179
- .yamato/upm-ci.yml#build_tvos_{{ editor.version }}
@@ -184,10 +196,12 @@ build_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}:
184196
type: Unity::VM
185197
image: package-ci/win10:default
186198
flavor: b1.xlarge
199+
variables:
200+
EDITOR_VERSION: {{ editor.version }}
187201
commands:
188202
- {{ utr_install_win }}
189203
- {{ unity_downloader_install }}
190-
- unity-downloader-cli -c Editor -c Android -u {{ editor.version }} --fast --wait
204+
- unity-downloader-cli -c Editor -c Android -u %EDITOR_VERSION% --fast --wait
191205
- ./utr --suite=playmode {% if category.name == "performance" %} --category=Performance {% endif %} --platform=Android --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --scripting-backend={{ backend.name }} --build-only --repository --performance-project-id=InputSystem
192206
after:
193207
- {{ instabilities_install_win }}
@@ -206,6 +220,8 @@ run_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}:
206220
type: Unity::mobile::shield
207221
image: package-ci/win10:default
208222
flavor: b1.medium
223+
variables:
224+
EDITOR_VERSION: {{ editor.version }}
209225
# Skip repository cloning
210226
skip_checkout: true
211227
# Set a dependency on the build job
@@ -237,7 +253,7 @@ run_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}:
237253
{% endfor %} # editors
238254

239255
all_tests:
240-
name: All Tests
256+
name: All Tests
241257
dependencies:
242258
{% for editor in editors %}
243259
{% for platform in platforms_win %}

0 commit comments

Comments
 (0)