diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-07-03 03:29:26 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-07-03 03:29:26 +0800 |
| commit | 9b0bc67066d76aca886377ac34c83e6de1c56ccd (patch) | |
| tree | 707f28e5d3976452afde09017e602eb1053789d2 /.circleci | |
| parent | f19ffaf08d49f33c395a25faf3eeb6b08d5285a4 (diff) | |
| parent | 4c86f25f5bc4fa18847ca1b77e005afc3f37eddc (diff) | |
| download | tangerine-wallet-browser-9b0bc67066d76aca886377ac34c83e6de1c56ccd.tar tangerine-wallet-browser-9b0bc67066d76aca886377ac34c83e6de1c56ccd.tar.gz tangerine-wallet-browser-9b0bc67066d76aca886377ac34c83e6de1c56ccd.tar.bz2 tangerine-wallet-browser-9b0bc67066d76aca886377ac34c83e6de1c56ccd.tar.lz tangerine-wallet-browser-9b0bc67066d76aca886377ac34c83e6de1c56ccd.tar.xz tangerine-wallet-browser-9b0bc67066d76aca886377ac34c83e6de1c56ccd.tar.zst tangerine-wallet-browser-9b0bc67066d76aca886377ac34c83e6de1c56ccd.zip | |
fix merge conflicts
Diffstat (limited to '.circleci')
| -rw-r--r-- | .circleci/config.yml | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index bc40c9a7c..0ad5cdf53 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -97,7 +97,7 @@ workflows: jobs: prep-deps-npm: docker: - - image: circleci/node:8-browsers + - image: circleci/node:8.11.3-browsers steps: - checkout - restore_cache: @@ -116,7 +116,7 @@ jobs: prep-deps-firefox: docker: - - image: circleci/node:8-browsers + - image: circleci/node:8.11.3-browsers steps: - checkout - run: @@ -129,7 +129,7 @@ jobs: prep-build: docker: - - image: circleci/node:8-browsers + - image: circleci/node:8.11.3-browsers steps: - checkout - restore_cache: @@ -148,7 +148,7 @@ jobs: prep-docs: docker: - - image: circleci/node:8-browsers + - image: circleci/node:8.11.3-browsers steps: - checkout - restore_cache: @@ -163,7 +163,7 @@ jobs: prep-scss: docker: - - image: circleci/node:8-browsers + - image: circleci/node:8.11.3-browsers steps: - checkout - restore_cache: @@ -182,7 +182,7 @@ jobs: test-lint: docker: - - image: circleci/node:8-browsers + - image: circleci/node:8.11.3-browsers steps: - checkout - restore_cache: @@ -193,7 +193,7 @@ jobs: test-deps: docker: - - image: circleci/node:8-browsers + - image: circleci/node:8.11.3-browsers steps: - checkout - restore_cache: @@ -204,7 +204,7 @@ jobs: test-e2e-chrome: docker: - - image: circleci/node:8-browsers + - image: circleci/node:8.11.3-browsers steps: - checkout - restore_cache: @@ -220,7 +220,7 @@ jobs: test-e2e-firefox: docker: - - image: circleci/node:8-browsers + - image: circleci/node:8.11.3-browsers steps: - checkout - restore_cache: @@ -241,7 +241,7 @@ jobs: test-e2e-beta-chrome: docker: - - image: circleci/node:8-browsers + - image: circleci/node:8.11.3-browsers steps: - checkout - restore_cache: @@ -257,7 +257,7 @@ jobs: test-e2e-beta-firefox: docker: - - image: circleci/node:8-browsers + - image: circleci/node:8.11.3-browsers steps: - checkout - restore_cache: @@ -278,7 +278,7 @@ jobs: job-screens: docker: - - image: circleci/node:8-browsers + - image: circleci/node:8.11.3-browsers steps: - checkout - restore_cache: @@ -295,7 +295,7 @@ jobs: job-publish-prerelease: docker: - - image: circleci/node:8-browsers + - image: circleci/node:8.11.3-browsers steps: - checkout - restore_cache: @@ -322,7 +322,7 @@ jobs: job-publish-release: docker: - - image: circleci/node:8-browsers + - image: circleci/node:8.11.3-browsers steps: - checkout - restore_cache: @@ -345,7 +345,7 @@ jobs: test-unit: docker: - - image: circleci/node:8-browsers + - image: circleci/node:8.11.3-browsers steps: - checkout - restore_cache: @@ -358,7 +358,7 @@ jobs: environment: browsers: '["Firefox"]' docker: - - image: circleci/node:8-browsers + - image: circleci/node:8.11.3-browsers steps: - checkout - restore_cache: @@ -382,7 +382,7 @@ jobs: environment: browsers: '["Chrome"]' docker: - - image: circleci/node:8-browsers + - image: circleci/node:8.11.3-browsers steps: - checkout - restore_cache: @@ -401,7 +401,7 @@ jobs: environment: browsers: '["Firefox"]' docker: - - image: circleci/node:8-browsers + - image: circleci/node:8.11.3-browsers steps: - checkout - restore_cache: @@ -425,7 +425,7 @@ jobs: environment: browsers: '["Chrome"]' docker: - - image: circleci/node:8-browsers + - image: circleci/node:8.11.3-browsers steps: - checkout - restore_cache: @@ -442,7 +442,7 @@ jobs: all-tests-pass: docker: - - image: circleci/node:8-browsers + - image: circleci/node:8.11.3-browsers steps: - run: name: All Tests Passed |