Skip to content

Commit

Permalink
Merge branch 'develop' into Version-5.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
danfinlay committed Jan 16, 2019
2 parents 7277534 + 1346330 commit 4acaffe
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ workflows:
requires:
- prep-deps-npm
- prep-build
- test-e2e-beta-drizzle:
requires:
- prep-deps-npm
- prep-build
# - test-e2e-beta-drizzle:
# requires:
# - prep-deps-npm
# - prep-build
- test-unit:
requires:
- prep-deps-npm
Expand All @@ -54,7 +54,7 @@ workflows:
- test-mozilla-lint
- test-e2e-beta-chrome
- test-e2e-beta-firefox
- test-e2e-beta-drizzle
# - test-e2e-beta-drizzle
- test-integration-flat-chrome
- test-integration-flat-firefox
- job-screens:
Expand Down Expand Up @@ -176,19 +176,19 @@ jobs:
name: Test
command: sudo npm install -g npm@6 && npm audit

test-e2e-beta-drizzle:
docker:
- image: circleci/node:8.11.3-browsers
steps:
- checkout
- attach_workspace:
at: .
- run:
name: test:e2e:drizzle:beta
command: npm run test:e2e:drizzle:beta
- store_artifacts:
path: test-artifacts
destination: test-artifacts
# test-e2e-beta-drizzle:
# docker:
# - image: circleci/node:8.11.3-browsers
# steps:
# - checkout
# - attach_workspace:
# at: .
# - run:
# name: test:e2e:drizzle:beta
# command: npm run test:e2e:drizzle:beta
# - store_artifacts:
# path: test-artifacts
# destination: test-artifacts
test-e2e-beta-chrome:
docker:
- image: circleci/node:8.11.3-browsers
Expand Down

0 comments on commit 4acaffe

Please sign in to comment.