diff options
| author | Dan Finlay <dan@danfinlay.com> | 2019-01-17 05:38:23 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2019-01-17 05:38:23 +0800 |
| commit | 4acaffeefdd663cc40eb9de85778d61af74c42b9 (patch) | |
| tree | 351f0976cc659d4a25a98d339614a6227c57db60 | |
| parent | 72775340bbbad5babb7a87da48e48029b41c9be5 (diff) | |
| parent | 13463309dce281ee6264d3d5a4399d0cc49c1f8f (diff) | |
| download | tangerine-wallet-browser-5.3.1.tar tangerine-wallet-browser-5.3.1.tar.gz tangerine-wallet-browser-5.3.1.tar.bz2 tangerine-wallet-browser-5.3.1.tar.lz tangerine-wallet-browser-5.3.1.tar.xz tangerine-wallet-browser-5.3.1.tar.zst tangerine-wallet-browser-5.3.1.zip | |
Merge branch 'develop' into Version-5.3.1v5.3.1
| -rw-r--r-- | .circleci/config.yml | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index d89a6ef4c..82bc87a2f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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 @@ -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: @@ -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 |