Skip to content

Commit c579845

Browse files
archmojarchmoj
authored
Merge pull request #7080 from birkskyum/use-cimg-for-CI
Use cimg/node instead of circleci/node
2 parents 34cade7 + 3293402 commit c579845

File tree

5 files changed

+43
-83
lines changed

5 files changed

+43
-83
lines changed

‎.circleci/config.yml‎

Lines changed: 18 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
install-and-cibuild: # main cibuild using node 16 & npm 7
3030
docker:
31-
- image: cimg/node:16.17.1
31+
- image: cimg/node:16.20.2
3232
working_directory: ~/plotly.js
3333
steps:
3434
- checkout
@@ -52,7 +52,7 @@ jobs:
5252
timezone-jasmine:
5353
docker:
5454
# need '-browsers' version to test in real (xvfb-wrapped) browsers
55-
- image: cimg/node:16.17.1-browsers
55+
- image: cimg/node:16.20.2-browsers
5656
working_directory: ~/plotly.js
5757
steps:
5858
- browser-tools/install-browser-tools: &browser-versions
@@ -84,7 +84,7 @@ jobs:
8484
no-gl-jasmine:
8585
docker:
8686
# need '-browsers' version to test in real (xvfb-wrapped) browsers
87-
- image: cimg/node:16.17.1-browsers
87+
- image: cimg/node:16.20.2-browsers
8888
environment:
8989
# Alaska time (arbitrary timezone to test date logic)
9090
TZ: "America/Anchorage"
@@ -103,7 +103,7 @@ jobs:
103103
webgl-jasmine:
104104
docker:
105105
# need '-browsers' version to test in real (xvfb-wrapped) browsers
106-
- image: cimg/node:16.17.1-browsers
106+
- image: cimg/node:16.20.2-browsers
107107
environment:
108108
# Alaska time (arbitrary timezone to test date logic)
109109
TZ: "America/Anchorage"
@@ -122,7 +122,7 @@ jobs:
122122
virtual-webgl-jasmine:
123123
docker:
124124
# need '-browsers' version to test in real (xvfb-wrapped) browsers
125-
- image: cimg/node:16.17.1-browsers
125+
- image: cimg/node:16.20.2-browsers
126126
environment:
127127
# Alaska time (arbitrary timezone to test date logic)
128128
TZ: "America/Anchorage"
@@ -141,7 +141,7 @@ jobs:
141141
flaky-no-gl-jasmine:
142142
docker:
143143
# need '-browsers' version to test in real (xvfb-wrapped) browsers
144-
- image: cimg/node:16.17.1-browsers
144+
- image: cimg/node:16.20.2-browsers
145145
environment:
146146
# Alaska time (arbitrary timezone to test date logic)
147147
TZ: "America/Anchorage"
@@ -159,7 +159,7 @@ jobs:
159159
bundle-jasmine:
160160
docker:
161161
# need '-browsers' version to test in real (xvfb-wrapped) browsers
162-
- image: cimg/node:16.17.1-browsers
162+
- image: cimg/node:16.20.2-browsers
163163
environment:
164164
# Alaska time (arbitrary timezone to test date logic)
165165
TZ: "America/Anchorage"
@@ -174,48 +174,10 @@ jobs:
174174
name: Run jasmine tests (part D)
175175
command: .circleci/test.sh bundle-jasmine
176176

177-
mathjax-firefox81:
178-
docker:
179-
# need '-browsers' version to test in real (xvfb-wrapped) browsers
180-
- image: cimg/node:16.17.1-browsers
181-
environment:
182-
# Alaska time (arbitrary timezone to test date logic)
183-
TZ: "America/Anchorage"
184-
working_directory: ~/plotly.js
185-
steps:
186-
- browser-tools/install-browser-tools: &browser-versions
187-
firefox-version: '81.0'
188-
install-chrome: false
189-
install-chromedriver: false
190-
- attach_workspace:
191-
at: ~/
192-
- run:
193-
name: Test MathJax on firefox-81
194-
command: .circleci/test.sh mathjax-firefox
195-
196-
mathjax-firefox82:
197-
docker:
198-
# need '-browsers' version to test in real (xvfb-wrapped) browsers
199-
- image: cimg/node:16.17.1-browsers
200-
environment:
201-
# Alaska time (arbitrary timezone to test date logic)
202-
TZ: "America/Anchorage"
203-
working_directory: ~/plotly.js
204-
steps:
205-
- browser-tools/install-browser-tools: &browser-versions
206-
firefox-version: '82.0'
207-
install-chrome: false
208-
install-chromedriver: false
209-
- attach_workspace:
210-
at: ~/
211-
- run:
212-
name: Test MathJax on firefox-82
213-
command: .circleci/test.sh mathjax-firefox82+
214-
215177
mathjax-firefoxLatest:
216178
docker:
217179
# need '-browsers' version to test in real (xvfb-wrapped) browsers
218-
- image: cimg/node:16.17.1-browsers
180+
- image: cimg/node:16.20.2-browsers
219181
environment:
220182
# Alaska time (arbitrary timezone to test date logic)
221183
TZ: "America/Anchorage"
@@ -228,7 +190,7 @@ jobs:
228190
at: ~/
229191
- run:
230192
name: Test MathJax on firefox-latest
231-
command: .circleci/test.sh mathjax-firefox82+
193+
command: .circleci/test.sh mathjax-firefox
232194

233195
make-baselines-virtual-webgl:
234196
parallelism: 8
@@ -307,7 +269,7 @@ jobs:
307269

308270
test-baselines:
309271
docker:
310-
- image: circleci/node:16.9.0
272+
- image: cimg/node:16.20.2
311273
working_directory: ~/plotly.js
312274
steps:
313275
- attach_workspace:
@@ -321,7 +283,7 @@ jobs:
321283

322284
test-baselines-virtual-webgl:
323285
docker:
324-
- image: circleci/node:16.9.0
286+
- image: cimg/node:16.20.2
325287
working_directory: ~/plotly.js
326288
steps:
327289
- attach_workspace:
@@ -335,7 +297,7 @@ jobs:
335297

336298
test-baselines-b64:
337299
docker:
338-
- image: circleci/node:16.9.0
300+
- image: cimg/node:16.20.2
339301
working_directory: ~/plotly.js
340302
steps:
341303
- attach_workspace:
@@ -349,7 +311,7 @@ jobs:
349311

350312
test-baselines-mathjax3:
351313
docker:
352-
- image: circleci/node:16.9.0
314+
- image: cimg/node:16.20.2
353315
working_directory: ~/plotly.js
354316
steps:
355317
- attach_workspace:
@@ -386,7 +348,7 @@ jobs:
386348

387349
test-exports:
388350
docker:
389-
- image: circleci/node:16.9.0
351+
- image: cimg/node:16.20.2
390352
working_directory: ~/plotly.js
391353
steps:
392354
- attach_workspace:
@@ -400,7 +362,7 @@ jobs:
400362

401363
mock-validation:
402364
docker:
403-
- image: cimg/node:16.17.1
365+
- image: cimg/node:16.20.2
404366
working_directory: ~/plotly.js
405367
steps:
406368
- attach_workspace:
@@ -414,7 +376,7 @@ jobs:
414376

415377
source-syntax:
416378
docker:
417-
- image: cimg/node:16.17.1
379+
- image: cimg/node:16.20.2
418380
working_directory: ~/plotly.js
419381
steps:
420382
- attach_workspace:
@@ -425,7 +387,7 @@ jobs:
425387

426388
publish-dist:
427389
docker:
428-
- image: cimg/node:16.17.1
390+
- image: cimg/node:16.20.2
429391
working_directory: ~/plotly.js
430392
steps:
431393
- checkout
@@ -495,7 +457,7 @@ jobs:
495457

496458
test-stackgl-bundle:
497459
docker:
498-
- image: cimg/node:16.17.1
460+
- image: cimg/node:16.20.2
499461
working_directory: ~/plotly.js
500462
steps:
501463
- checkout
@@ -525,12 +487,6 @@ workflows:
525487
- bundle-jasmine:
526488
requires:
527489
- install-and-cibuild
528-
- mathjax-firefox81:
529-
requires:
530-
- install-and-cibuild
531-
- mathjax-firefox82:
532-
requires:
533-
- install-and-cibuild
534490
- mathjax-firefoxLatest:
535491
requires:
536492
- install-and-cibuild

‎.circleci/test.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ case $1 in
8484
exit $EXIT_STATE
8585
;;
8686

87-
mathjax-firefox82+)
88-
./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --skip-tags=noFF82 --nowatch &&
89-
./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --mathjax3 --skip-tags=noFF82 --nowatch &&
87+
mathjax-firefox)
88+
./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --nowatch &&
89+
./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --mathjax3 --nowatch &&
9090
./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax_config --mathjax3 --nowatch &&
9191
./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax_config --nowatch || EXIT_STATE=$?
9292
exit $EXIT_STATE

‎draftlogs/7080_change.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- Use cimg/node instead of circleci/node in CI [[#7080](https://github.com/plotly/plotly.js/pull/7080)]
2+

‎tasks/test_syntax.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ assertCircularDeps();
3131
// check for for focus and exclude jasmine blocks
3232
function assertJasmineSuites() {
3333
var BLACK_LIST = ['fdescribe', 'fit', 'xdescribe', 'xit'];
34-
var TAGS = ['noCI', 'noCIdep', 'noFF82', 'gl', 'flaky'];
34+
var TAGS = ['noCI', 'noCIdep', 'gl', 'flaky'];
3535
var IT_ONLY_TAGS = ['gl', 'flaky'];
3636
var logs = [];
3737

‎test/jasmine/bundle_tests/mathjax_test.js‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -95,24 +95,26 @@ describe('Test MathJax v' + mathjaxVersion + ':', function() {
9595
.then(done, done.fail);
9696
});
9797

98-
it('@noFF82 should scoot x-axis title (with MathJax) below x-axis ticks', function(done) {
99-
expect(window.MathJax).toBeDefined();
10098

101-
testTitleScoot({
102-
data: [{
103-
y: [1, 2, 1]
104-
}],
105-
layout: {
106-
xaxis: {title: texTitle},
107-
width: 500,
108-
height: 500,
109-
margin: {t: 100, b: 100, l: 100, r: 100}
110-
}
111-
}, {
112-
xCategories: longCats
113-
})
114-
.then(done, done.fail);
115-
});
99+
// Firefox bug - see https://bugzilla.mozilla.org/show_bug.cgi?id=1350755
100+
// it('should scoot x-axis title (with MathJax) below x-axis ticks', function(done) {
101+
// expect(window.MathJax).toBeDefined();
102+
103+
// testTitleScoot({
104+
// data: [{
105+
// y: [1, 2, 1]
106+
// }],
107+
// layout: {
108+
// xaxis: {title: texTitle},
109+
// width: 500,
110+
// height: 500,
111+
// margin: {t: 100, b: 100, l: 100, r: 100}
112+
// }
113+
// }, {
114+
// xCategories: longCats
115+
// })
116+
// .then(done, done.fail);
117+
// });
116118

117119
it('should scoot x-axis title below x-axis ticks (with MathJax)', function(done) {
118120
expect(window.MathJax).toBeDefined();

0 commit comments

Comments
 (0)