Skip to content

Commit 7b33575

Browse files
authored
Merge pull request #5948 from plotly/new-circleci-containers
Migrate most of legacy `circleci` images to new `cimg`
2 parents bc66a58 + d84b796 commit 7b33575

File tree

1 file changed

+33
-11
lines changed

1 file changed

+33
-11
lines changed

.circleci/config.yml

+33-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
version: 2.0
1+
version: 2.1
2+
orbs:
3+
browser-tools: circleci/[email protected]
24

35
# Inspired by:
46
# https://github.com/CircleCI-Public/circleci-demo-workflows/blob/workspace-forwarding/.circleci/config.yml
57
# https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
68
#
79
# For list of official CircleCI node.js images, go to:
8-
# https://hub.docker.com/r/circleci/node/tags/
10+
# https://hub.docker.com/r/cimg/node/tags/
911

1012
jobs:
1113
install-and-cibuild:
1214
docker:
13-
- image: circleci/node:16.8.0
15+
- image: cimg/node:16.8.0
1416
working_directory: ~/plotly.js
1517
steps:
1618
- checkout
@@ -34,9 +36,13 @@ jobs:
3436
timezone-jasmine:
3537
docker:
3638
# need '-browsers' version to test in real (xvfb-wrapped) browsers
37-
- image: circleci/node:16.8.0-browsers
39+
- image: cimg/node:16.8.0-browsers
3840
working_directory: ~/plotly.js
3941
steps:
42+
- browser-tools/install-browser-tools: &browser-versions
43+
chrome-version: 93.0.4577.63
44+
install-firefox: false
45+
install-geckodriver: false
4046
- attach_workspace:
4147
at: ~/
4248
- run:
@@ -63,13 +69,17 @@ jobs:
6369
no-gl-jasmine:
6470
docker:
6571
# need '-browsers' version to test in real (xvfb-wrapped) browsers
66-
- image: circleci/node:16.8.0-browsers
72+
- image: cimg/node:16.8.0-browsers
6773
environment:
6874
# Alaska time (arbitrary timezone to test date logic)
6975
TZ: "America/Anchorage"
7076
parallelism: 8
7177
working_directory: ~/plotly.js
7278
steps:
79+
- browser-tools/install-browser-tools: &browser-versions
80+
chrome-version: 93.0.4577.63
81+
install-firefox: false
82+
install-geckodriver: false
7383
- attach_workspace:
7484
at: ~/
7585
- run:
@@ -79,13 +89,17 @@ jobs:
7989
webgl-jasmine:
8090
docker:
8191
# need '-browsers' version to test in real (xvfb-wrapped) browsers
82-
- image: circleci/node:16.8.0-browsers
92+
- image: cimg/node:16.8.0-browsers
8393
environment:
8494
# Alaska time (arbitrary timezone to test date logic)
8595
TZ: "America/Anchorage"
8696
parallelism: 8
8797
working_directory: ~/plotly.js
8898
steps:
99+
- browser-tools/install-browser-tools: &browser-versions
100+
chrome-version: 93.0.4577.63
101+
install-firefox: false
102+
install-geckodriver: false
89103
- attach_workspace:
90104
at: ~/
91105
- run:
@@ -95,12 +109,16 @@ jobs:
95109
flaky-no-gl-jasmine:
96110
docker:
97111
# need '-browsers' version to test in real (xvfb-wrapped) browsers
98-
- image: circleci/node:16.8.0-browsers
112+
- image: cimg/node:16.8.0-browsers
99113
environment:
100114
# Alaska time (arbitrary timezone to test date logic)
101115
TZ: "America/Anchorage"
102116
working_directory: ~/plotly.js
103117
steps:
118+
- browser-tools/install-browser-tools: &browser-versions
119+
chrome-version: 93.0.4577.63
120+
install-firefox: false
121+
install-geckodriver: false
104122
- attach_workspace:
105123
at: ~/
106124
- run:
@@ -110,12 +128,16 @@ jobs:
110128
bundle-jasmine:
111129
docker:
112130
# need '-browsers' version to test in real (xvfb-wrapped) browsers
113-
- image: circleci/node:16.8.0-browsers
131+
- image: cimg/node:16.8.0-browsers
114132
environment:
115133
# Alaska time (arbitrary timezone to test date logic)
116134
TZ: "America/Anchorage"
117135
working_directory: ~/plotly.js
118136
steps:
137+
- browser-tools/install-browser-tools: &browser-versions
138+
chrome-version: 93.0.4577.63
139+
install-firefox: false
140+
install-geckodriver: false
119141
- attach_workspace:
120142
at: ~/
121143
- run:
@@ -192,7 +214,7 @@ jobs:
192214

193215
mock-validation:
194216
docker:
195-
- image: circleci/node:16.8.0
217+
- image: cimg/node:16.8.0
196218
working_directory: ~/plotly.js
197219
steps:
198220
- attach_workspace:
@@ -206,7 +228,7 @@ jobs:
206228

207229
source-syntax:
208230
docker:
209-
- image: circleci/node:16.8.0
231+
- image: cimg/node:16.8.0
210232
working_directory: ~/plotly.js
211233
steps:
212234
- attach_workspace:
@@ -217,7 +239,7 @@ jobs:
217239

218240
publish-dist:
219241
docker:
220-
- image: circleci/node:16.8.0
242+
- image: cimg/node:16.8.0
221243
working_directory: ~/plotly.js
222244
steps:
223245
- checkout

0 commit comments

Comments
 (0)