Skip to content

Commit 1208c5b

Browse files
authored
Merge pull request #266 from plotly/pr-bump-electron-6
bump electron to 6.1.4
2 parents 010190a + 22032a4 commit 1208c5b

56 files changed

Lines changed: 64914 additions & 200651 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.circleci/config.yml

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ workflows:
3232
- test-image:
3333
requires:
3434
- docker-build-and-push
35+
- test-dash-preview:
36+
requires:
37+
- docker-build-and-push
3538

3639
version: 2
3740
jobs:
@@ -83,6 +86,7 @@ jobs:
8386
command: npm run coverage
8487
- store_artifacts:
8588
path: build
89+
destination: /
8690

8791
test-node-v6:
8892
<<: *base
@@ -103,7 +107,24 @@ jobs:
103107
name: Run image test
104108
command: ./.circleci/test-image.sh
105109
- store_artifacts:
106-
path: build/
110+
path: build
111+
destination: /
112+
113+
test-dash-preview:
114+
docker:
115+
- image: quay.io/plotly/image-exporter:$CIRCLE_SHA1
116+
- image: quay.io/plotly/image-exporter:$CIRCLE_SHA1
117+
environment:
118+
LIBGL_ALWAYS_SOFTWARE: true
119+
GALLIUM_DRIVER: softpipe
120+
steps:
121+
- checkout
122+
- run:
123+
name: Run dash-preview test
124+
command: ./.circleci/test-dash-preview.sh
125+
- store_artifacts:
126+
path: build
127+
destination: /
107128

108129
docker-build-and-push:
109130
docker:
@@ -236,3 +257,4 @@ jobs:
236257
zip -r artifacts/conda-linux-64.zip ./linux-64
237258
- store_artifacts:
238259
path: artifacts
260+
destination: /

.circleci/test-dash-preview.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/bash
2+
3+
# override CircleCi's default run settings,
4+
# so that we run all tests and do not exit early
5+
# on test failures.
6+
set +e
7+
set +o pipefail
8+
9+
./test/dash-preview/render_mocks_cli build/test_dash_previews
10+
#./test/image/compare_images test/image/baselines build/test_images build/test_images_diff

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ docker build -t "$DOCKER_ORCA_IMAGE" -f deployment/Dockerfile .
9494
To run the image tests, run the following:
9595
```
9696
./test/image/render_mocks_cli build/test_images "$DOCKER_ORCA_IMAGE" && \
97-
./test/image/compare_images test/image/baselines build/test_images build/
97+
./test/image/compare_images test/image/baselines build/test_images build/test_images_diff
9898
```
9999

100100
#### Generate new baselines

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ If you have Node.js installed (recommended v8.x), you can easily install Orca
3131
using npm as:
3232

3333
```
34-
$ npm install -g electron@1.8.4 orca
34+
$ npm install -g electron@6.1.4 orca
3535
```
3636

3737
which makes the `orca` executable available in your path.

bin/orca.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,8 @@ const args = process.argv.slice(2)
88
const pathToMain = path.join(__dirname, 'orca_electron.js')
99
args.unshift(path.resolve(pathToMain))
1010

11+
// Sandbox is enabled by default since electron v5
12+
// Fix sandbox issue (https://github.com/electron/electron/issues/17972)
13+
args.push('--no-sandbox')
14+
1115
spawn(electronPath, args, { stdio: 'inherit' })

0 commit comments

Comments
 (0)