Skip to content

Commit 43b2bff

Browse files
emilyklemilykl
authored
Merge pull request #7711 from plotly/upgrade-circleci-browser-tools-version-ci
[chore] CI maintenance: Fix error where Chrome fails to download
2 parents 65265d7 + b9aac06 commit 43b2bff

File tree

4 files changed

+46
-44
lines changed

4 files changed

+46
-44
lines changed

‎.circleci/config.yml‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: 2.1
22
orbs:
3-
browser-tools: circleci/browser-tools@1.5.1
3+
browser-tools: circleci/browser-tools@2.4.0
44

55
# Inspired by:
66
# https://github.com/CircleCI-Public/circleci-demo-workflows/blob/workspace-forwarding/.circleci/config.yml
@@ -40,11 +40,11 @@ jobs:
4040
working_directory: ~/plotly.js
4141
steps:
4242
- run: sudo apt-get update
43-
- browser-tools/install-browser-tools:
44-
install-firefox: false
45-
install-geckodriver: false
46-
install-chrome: true
47-
chrome-version: "132.0.6834.110"
43+
- browser-tools/install_browser_tools:
44+
install_firefox: false
45+
install_geckodriver: false
46+
install_chrome: true
47+
chrome_version: "133.0.6943.126"
4848
- attach_workspace:
4949
at: ~/
5050
- run:
@@ -79,11 +79,11 @@ jobs:
7979
working_directory: ~/plotly.js
8080
steps:
8181
- run: sudo apt-get update
82-
- browser-tools/install-browser-tools:
83-
install-firefox: false
84-
install-geckodriver: false
85-
install-chrome: true
86-
chrome-version: "132.0.6834.110"
82+
- browser-tools/install_browser_tools:
83+
install_firefox: false
84+
install_geckodriver: false
85+
install_chrome: true
86+
chrome_version: "133.0.6943.126"
8787
- attach_workspace:
8888
at: ~/
8989
- run:
@@ -101,11 +101,11 @@ jobs:
101101
working_directory: ~/plotly.js
102102
steps:
103103
- run: sudo apt-get update
104-
- browser-tools/install-browser-tools:
105-
install-firefox: false
106-
install-geckodriver: false
107-
install-chrome: true
108-
chrome-version: "132.0.6834.110"
104+
- browser-tools/install_browser_tools:
105+
install_firefox: false
106+
install_geckodriver: false
107+
install_chrome: true
108+
chrome_version: "133.0.6943.126"
109109
- attach_workspace:
110110
at: ~/
111111
- run:
@@ -123,11 +123,11 @@ jobs:
123123
working_directory: ~/plotly.js
124124
steps:
125125
- run: sudo apt-get update
126-
- browser-tools/install-browser-tools:
127-
install-firefox: false
128-
install-geckodriver: false
129-
install-chrome: true
130-
chrome-version: "132.0.6834.110"
126+
- browser-tools/install_browser_tools:
127+
install_firefox: false
128+
install_geckodriver: false
129+
install_chrome: true
130+
chrome_version: "133.0.6943.126"
131131
- attach_workspace:
132132
at: ~/
133133
- run:
@@ -144,11 +144,11 @@ jobs:
144144
parallelism: 8
145145
working_directory: ~/plotly.js
146146
steps:
147-
- browser-tools/install-browser-tools: &browser-versions
148-
install-firefox: false
149-
install-geckodriver: false
150-
install-chrome: true
151-
chrome-version: "143.0.7499.192" # TEMPORARY pin until WebGL issues with 144 are resolved
147+
- browser-tools/install_browser_tools: &browser-versions
148+
install_firefox: false
149+
install_geckodriver: false
150+
install_chrome: true
151+
chrome_version: "143.0.7499.192" # TEMPORARY pin until WebGL issues with 144 are resolved
152152
- attach_workspace:
153153
at: ~/
154154
- run:
@@ -165,11 +165,11 @@ jobs:
165165
working_directory: ~/plotly.js
166166
steps:
167167
- run: sudo apt-get update
168-
- browser-tools/install-browser-tools:
169-
install-firefox: false
170-
install-geckodriver: false
171-
install-chrome: true
172-
chrome-version: "132.0.6834.110"
168+
- browser-tools/install_browser_tools:
169+
install_firefox: false
170+
install_geckodriver: false
171+
install_chrome: true
172+
chrome_version: "133.0.6943.126"
173173
- attach_workspace:
174174
at: ~/
175175
- run:
@@ -186,11 +186,11 @@ jobs:
186186
working_directory: ~/plotly.js
187187
steps:
188188
- run: sudo apt-get update
189-
- browser-tools/install-browser-tools:
190-
install-firefox: false
191-
install-geckodriver: false
192-
install-chrome: true
193-
chrome-version: "132.0.6834.110"
189+
- browser-tools/install_browser_tools:
190+
install_firefox: false
191+
install_geckodriver: false
192+
install_chrome: true
193+
chrome_version: "133.0.6943.126"
194194
- attach_workspace:
195195
at: ~/
196196
- run:
@@ -206,9 +206,9 @@ jobs:
206206
TZ: "America/Anchorage"
207207
working_directory: ~/plotly.js
208208
steps:
209-
- browser-tools/install-browser-tools:
210-
install-chrome: false
211-
install-chromedriver: false
209+
- browser-tools/install_browser_tools:
210+
install_chrome: false
211+
install_chromedriver: false
212212
- attach_workspace:
213213
at: ~/
214214
- run:

‎test/image/baselines/map_custom-style.png‎

-3.99 KB
Loading

‎test/jasmine/tests/geo_test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2759,10 +2759,10 @@ describe('Test geo interactions update marker angles:', function() {
27592759
})
27602760
.then(function() {
27612761
newPath = getPath();
2762-
expect(newPath).toEqual('M0,0L18.224184879370906,8.238876469671625L19.58636536037447,-4.046516028625488Z');
2762+
expect(newPath).toEqual('M0,0L18.224184922503092,8.238876374264322L19.586365339190138,-4.046516131164082Z');
27632763

27642764
expect(newPath).not.toEqual(initialPath);
2765-
expect(newPath).toEqual('M0,0L18.224184879370906,8.238876469671625L19.58636536037447,-4.046516028625488Z');
2765+
expect(newPath).toEqual('M0,0L18.224184922503092,8.238876374264322L19.586365339190138,-4.046516131164082Z');
27662766
expect(initialPath).toEqual('M0,0L-1.5094067529528923,19.942960945008643L10.501042615957648,17.021401351764233Z');
27672767
})
27682768
.then(done, done.fail);

‎test/jasmine/tests/transition_test.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,8 @@ describe('Plotly.react transitions:', function() {
304304
});
305305

306306
if(failEarly) {
307+
// Reset spy counters even if test fails (to avoid causing subsequent tests to fail)
308+
resetSpyCounters();
307309
return fail(_msg + '- Wrong calls, assertSpies early fail');
308310
}
309311

@@ -334,6 +336,8 @@ describe('Plotly.react transitions:', function() {
334336

335337
// sanity check
336338
if(actuals.length !== exps.length) {
339+
// Reset spy counters even if test fails (to avoid causing subsequent tests to fail)
340+
resetSpyCounters();
337341
return fail(_msg + '- Something went wrong when building "actual" callData list');
338342
}
339343

@@ -628,15 +632,13 @@ describe('Plotly.react transitions:', function() {
628632
layout.xaxis.range = [-2, 2];
629633
return Plotly.react(gd, data, layout);
630634
})
631-
.then(delay(50))
635+
.then(delay(300))
632636
.then(function() {
633637
assertSpies('just layout transition', [
634638
[Plots, 'transitionFromReact', 1],
635639
[gd._fullLayout._basePlotModules[0], 'transitionAxes', 1],
636640
[Axes, 'drawOne', 1],
637641
[Axes, 'drawOne', 1],
638-
[Axes, 'drawOne', 1],
639-
[Axes, 'drawOne', 1],
640642
// one _module.plot call from the relayout at end of axis transition
641643
[Registry, 'call', ['relayout', gd, {'xaxis.range': [-2, 2]}]],
642644
[Axes, 'drawOne', 1],

0 commit comments

Comments
 (0)