Skip to content

Commit 2de1fde

Browse files
authored
chore: Change the condition of trigger on Yamato CI (#498)
* change trigger for CI * fix
1 parent 4aadd72 commit 2de1fde

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

.yamato/meta/environments.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ platforms:
1010
type: Unity::VM::GPU
1111
image: renderstreaming/win10:latest
1212
flavor: b1.large
13+
model: rtx2080
1314
packed_webapp_name: webserver.exe
1415
test_params:
1516
# todo(kazuki) : this comment is workaround for avoiding template test error on Yamato.
@@ -45,6 +46,7 @@ platforms:
4546
type: Unity::VM::GPU
4647
image: renderstreaming/ubuntu-18.04:latest
4748
flavor: b1.large
49+
model: rtx2080
4850
packed_webapp_name: webserver
4951
test_params:
5052
- backend: mono

.yamato/upm-ci-renderstreaming-packages.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,14 +124,17 @@ test_{{ package.name }}_{{ editor.version }}_android_{{ target.name }}:
124124
{% endfor %}
125125

126126
{% for platform in platforms %}
127-
{% if platform.name != "macos" -%}
127+
{% if platform.name != "macos" %}
128128
{% for param in platform.test_params %}
129129
test_{{ package.name }}_{{ param.platform }}_{{ param.backend }}_{{ platform.name }}_{{ editor.version }}:
130130
name : Test {{ package.packagename }} {{ param.platform }} {{ param.backend }} {{ editor.version }} on {{ platform.name }}
131131
agent:
132132
type: {{ platform.type }}
133133
image: {{ platform.image }}
134-
flavor: {{ platform.flavor}}
134+
flavor: {{ platform.flavor }}
135+
{% if platform.model %}
136+
model: {{ platform.model }}
137+
{% endif %}
135138
commands:
136139
- npm install upm-ci-utils@{{ upm.package_version }} -g --registry {{ upm.registry_url }}
137140
{% if platform.name == "win" %}
@@ -157,7 +160,10 @@ test_{{ project.name }}_{{ param.platform }}_{{ param.backend }}_{{ platform.nam
157160
agent:
158161
type: {{ platform.type }}
159162
image: {{ platform.image }}
160-
flavor: {{ platform.flavor}}
163+
flavor: {{ platform.flavor }}
164+
{% if platform.model %}
165+
model: {{ platform.model }}
166+
{% endif %}
161167
commands:
162168
- npm install upm-ci-utils@{{ upm.package_version }} -g --registry {{ upm.registry_url }}
163169
{% if platform.name != "win" %}
@@ -311,11 +317,7 @@ trigger_test_{{ package.name }}_{{ editor.version }}:
311317
- .yamato/upm-ci-{{ package.name }}-packages.yml#test_{{ package.name }}_{{ editor.version }}
312318
{% if editor.version == "2020.3" -%}
313319
triggers:
314-
branches:
315-
only:
316-
- "/.*/"
317-
except:
318-
- "master"
320+
expression: pull_request.target eq "develop"
319321
{% endif -%}
320322

321323
test_{{ package.name }}_{{ editor.version }}:

.yamato/upm-ci-webapp.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,7 @@ test_{{ platform.name }}:
5757
trigger_webapp_test_{{ project.name }}:
5858
name : Trigger all WebApp test {{ project.packagename }}
5959
triggers:
60-
branches:
61-
only:
62-
- "/.*/"
63-
except:
64-
- "master"
60+
expression: pull_request.target eq "develop"
6561
dependencies:
6662
{% for platform in platforms %}
6763
- .yamato/upm-ci-webapp.yml#test_{{ platform.name }}

0 commit comments

Comments
 (0)