Skip to content

Commit 0127606

Browse files
committed
Switch back to xvfb
1 parent d44372c commit 0127606

File tree

2 files changed

+37
-17
lines changed

2 files changed

+37
-17
lines changed

.github/workflows/ci.yml

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,24 +59,32 @@ jobs:
5959
- uses: ./.github/actions/setup-chrome
6060

6161
- name: Run hover_label test in UTC timezone
62-
run: date && npm run test-jasmine hover_label
62+
uses: coactions/setup-xvfb@v1
6363
env:
6464
TZ: 'UTC'
65+
with:
66+
run: npm run test-jasmine hover_label
6567

6668
- name: Run hover_label test in Europe/Berlin timezone
67-
run: date && npm run test-jasmine hover_label
69+
uses: coactions/setup-xvfb@v1
6870
env:
6971
TZ: 'Europe/Berlin'
72+
with:
73+
run: npm run test-jasmine hover_label
7074

7175
- name: Run hover_label test in Asia/Tokyo timezone
72-
run: date && npm run test-jasmine hover_label
76+
uses: coactions/setup-xvfb@v1
7377
env:
7478
TZ: 'Asia/Tokyo'
79+
with:
80+
run: npm run test-jasmine hover_label
7581

7682
- name: Run hover_label test in America/Toronto timezone
77-
run: date && npm run test-jasmine hover_label
83+
uses: coactions/setup-xvfb@v1
7884
env:
7985
TZ: 'America/Toronto'
86+
with:
87+
run: npm run test-jasmine hover_label
8088

8189
no-gl-jasmine:
8290
needs: install-and-cibuild
@@ -95,7 +103,9 @@ jobs:
95103
- uses: ./.github/actions/setup-chrome
96104

97105
- name: Run jasmine tests (no-gl, shard ${{ matrix.shard }})
98-
run: .github/scripts/test.sh no-gl-jasmine
106+
uses: coactions/setup-xvfb@v1
107+
with:
108+
run: .github/scripts/test.sh no-gl-jasmine
99109

100110
webgl-jasmine:
101111
needs: install-and-cibuild
@@ -114,7 +124,9 @@ jobs:
114124
- uses: ./.github/actions/setup-chrome
115125

116126
- name: Run jasmine tests (webgl, shard ${{ matrix.shard }})
117-
run: .github/scripts/test.sh webgl-jasmine
127+
uses: coactions/setup-xvfb@v1
128+
with:
129+
run: .github/scripts/test.sh webgl-jasmine
118130

119131
virtual-webgl-jasmine:
120132
needs: install-and-cibuild
@@ -133,7 +145,9 @@ jobs:
133145
- uses: ./.github/actions/setup-chrome
134146

135147
- name: Run jasmine tests (virtual-webgl, shard ${{ matrix.shard }})
136-
run: .github/scripts/test.sh virtual-webgl-jasmine
148+
uses: coactions/setup-xvfb@v1
149+
with:
150+
run: .github/scripts/test.sh virtual-webgl-jasmine
137151

138152
webgl-jasmine-chromeLatest:
139153
needs: install-and-cibuild
@@ -154,7 +168,9 @@ jobs:
154168
chrome-version: '143.0.7499.192'
155169

156170
- name: Run jasmine tests (webgl chromeLatest, shard ${{ matrix.shard }})
157-
run: .github/scripts/test.sh webgl-jasmine
171+
uses: coactions/setup-xvfb@v1
172+
with:
173+
run: .github/scripts/test.sh webgl-jasmine
158174

159175
flaky-no-gl-jasmine:
160176
needs: install-and-cibuild
@@ -169,7 +185,9 @@ jobs:
169185
- uses: ./.github/actions/setup-chrome
170186

171187
- name: Run flaky jasmine tests
172-
run: .github/scripts/test.sh flaky-no-gl-jasmine
188+
uses: coactions/setup-xvfb@v1
189+
with:
190+
run: .github/scripts/test.sh flaky-no-gl-jasmine
173191

174192
bundle-jasmine:
175193
needs: install-and-cibuild
@@ -182,7 +200,9 @@ jobs:
182200
- uses: ./.github/actions/setup-chrome
183201

184202
- name: Run bundle jasmine tests
185-
run: .github/scripts/test.sh bundle-jasmine
203+
uses: coactions/setup-xvfb@v1
204+
with:
205+
run: .github/scripts/test.sh bundle-jasmine
186206

187207
mathjax-firefoxLatest:
188208
needs: install-and-cibuild
@@ -196,7 +216,9 @@ jobs:
196216
- uses: browser-actions/setup-firefox@v1
197217

198218
- name: Test MathJax on firefox-latest
199-
run: .github/scripts/test.sh mathjax-firefox
219+
uses: coactions/setup-xvfb@v1
220+
with:
221+
run: .github/scripts/test.sh mathjax-firefox
200222

201223
# ============================================================
202224
# noCI tests (merged from test.yml)
@@ -210,7 +232,9 @@ jobs:
210232
- uses: ./.github/actions/setup-chrome
211233

212234
- name: Run noCI tests
213-
run: ./tasks/noci_test.sh jasmine
235+
uses: coactions/setup-xvfb@v1
236+
with:
237+
run: ./tasks/noci_test.sh jasmine
214238

215239
# ============================================================
216240
# Image baseline generation and comparison

test/jasmine/karma.conf.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,6 @@ func.defaultConfig = {
260260
flags: [
261261
'--touch-events',
262262
'--window-size=' + argv.width + ',' + argv.height,
263-
isCI ? '--headless=new' : '',
264263
isCI ? '--ignore-gpu-blocklist' : '',
265264
isCI && process.env.GITHUB_ACTIONS ? '--enable-unsafe-swiftshader' : '',
266265
isCI && process.env.GITHUB_ACTIONS ? '--no-sandbox' : '',
@@ -269,10 +268,7 @@ func.defaultConfig = {
269268
},
270269
_Firefox: {
271270
base: 'Firefox',
272-
flags: [
273-
'--width=' + argv.width, '--height=' + argv.height,
274-
isCI ? '--headless' : ''
275-
],
271+
flags: ['--width=' + argv.width, '--height=' + argv.height],
276272
prefs: {
277273
'devtools.toolbox.zoomValue': '1.5',
278274
'devtools.toolbox.host': 'window',

0 commit comments

Comments
 (0)