Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ workflows:
- test-image:
requires:
- docker-build-and-push
- test-dash-preview:
requires:
- docker-build-and-push

version: 2
jobs:
Expand Down Expand Up @@ -83,6 +86,7 @@ jobs:
command: npm run coverage
- store_artifacts:
path: build
destination: /

test-node-v6:
<<: *base
Expand All @@ -103,7 +107,24 @@ jobs:
name: Run image test
command: ./.circleci/test-image.sh
- store_artifacts:
path: build/
path: build
destination: /

test-dash-preview:
docker:
- image: quay.io/plotly/image-exporter:$CIRCLE_SHA1
- image: quay.io/plotly/image-exporter:$CIRCLE_SHA1
environment:
LIBGL_ALWAYS_SOFTWARE: true
GALLIUM_DRIVER: softpipe
steps:
- checkout
- run:
name: Run dash-preview test
command: ./.circleci/test-dash-preview.sh
- store_artifacts:
path: build
destination: /

docker-build-and-push:
docker:
Expand Down Expand Up @@ -233,3 +254,4 @@ jobs:
zip -r artifacts/conda-linux-64.zip ./linux-64
- store_artifacts:
path: artifacts
destination: /
10 changes: 10 additions & 0 deletions .circleci/test-dash-preview.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash

# override CircleCi's default run settings,
# so that we run all tests and do not exit early
# on test failures.
set +e
set +o pipefail

./test/dash-preview/render_mocks_cli build/test_dash_previews
#./test/image/compare_images test/image/baselines build/test_images build/test_images_diff
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ docker build -t "$DOCKER_ORCA_IMAGE" -f deployment/Dockerfile .
To run the image tests, run the following:
```
./test/image/render_mocks_cli build/test_images "$DOCKER_ORCA_IMAGE" && \
./test/image/compare_images test/image/baselines build/test_images build/
./test/image/compare_images test/image/baselines build/test_images build/test_images_diff
```

#### Generate new baselines
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ If you have Node.js installed (recommended v8.x), you can easily install Orca
using npm as:

```
$ npm install -g electron@1.8.4 orca
$ npm install -g electron@6.1.4 orca
```

which makes the `orca` executable available in your path.
Expand Down
4 changes: 4 additions & 0 deletions bin/orca.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,8 @@ const args = process.argv.slice(2)
const pathToMain = path.join(__dirname, 'orca_electron.js')
args.unshift(path.resolve(pathToMain))

// Sandbox is enabled by default since electron v5
// Fix sandbox issue (https://github.com/electron/electron/issues/17972)
args.push('--no-sandbox')

spawn(electronPath, args, { stdio: 'inherit' })
Loading