aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.circleci/config.yml20
-rw-r--r--package.json3
-rw-r--r--yarn.lock25
3 files changed, 17 insertions, 31 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0ab512f58..756a17fce 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,7 +4,7 @@ jobs:
build:
resource_class: medium+
docker:
- - image: circleci/node:9
+ - image: circleci/node:9-browsers
environment:
CONTRACTS_COMMIT_HASH: '9ed05f5'
working_directory: ~/repo
@@ -16,7 +16,7 @@ jobs:
command: sudo npm install --global yarn@1.9.4
- run:
name: yarn
- command: yarn --frozen-lockfile install || yarn --frozen-lockfile install
+ command: yarn --frozen-lockfile --ignore-engines install || yarn --frozen-lockfile --ignore-engines install
- run: yarn build:ci:no_website
- save_cache:
key: repo-{{ .Environment.CIRCLE_SHA1 }}
@@ -25,7 +25,7 @@ jobs:
build-website:
resource_class: medium+
docker:
- - image: circleci/node:9
+ - image: circleci/node:9-browsers
working_directory: ~/repo
steps:
- restore_cache:
@@ -34,7 +34,7 @@ jobs:
- run: cd packages/website && yarn build:prod
test-contracts-ganache:
docker:
- - image: circleci/node:9
+ - image: circleci/node:9-browsers
working_directory: ~/repo
steps:
- restore_cache:
@@ -43,7 +43,7 @@ jobs:
- run: yarn wsrun test:circleci contracts
test-contracts-geth:
docker:
- - image: circleci/node:9
+ - image: circleci/node:9-browsers
- image: 0xorg/devnet
working_directory: ~/repo
steps:
@@ -56,7 +56,7 @@ jobs:
test-publish:
resource_class: medium+
docker:
- - image: circleci/node:9
+ - image: circleci/node:9-browsers
- image: 0xorg/verdaccio
working_directory: ~/repo
steps:
@@ -66,7 +66,7 @@ jobs:
- run: yarn test:publish:circleci
test-doc-generation:
docker:
- - image: circleci/node:9
+ - image: circleci/node:9-browsers
working_directory: ~/repo
steps:
- restore_cache:
@@ -75,7 +75,7 @@ jobs:
- run: yarn test:generate_docs:circleci
test-rest:
docker:
- - image: circleci/node:9
+ - image: circleci/node:9-browsers
working_directory: ~/repo
steps:
- restore_cache:
@@ -248,7 +248,7 @@ jobs:
static-tests:
working_directory: ~/repo
docker:
- - image: circleci/node:9
+ - image: circleci/node:9-browsers
steps:
- restore_cache:
keys:
@@ -259,7 +259,7 @@ jobs:
- run: yarn bundlewatch
submit-coverage:
docker:
- - image: circleci/node:9
+ - image: circleci/node:9-browsers
working_directory: ~/repo
steps:
- restore_cache:
diff --git a/package.json b/package.json
index 801657f5d..953f51eb3 100644
--- a/package.json
+++ b/package.json
@@ -61,6 +61,9 @@
"repoBranchBase": "development"
}
},
+ "resolutions": {
+ "graceful-fs": "4.1.15"
+ },
"devDependencies": {
"@0x-lerna-fork/lerna": "3.0.0-beta.25",
"@0xproject/npm-cli-login": "^0.0.11",
diff --git a/yarn.lock b/yarn.lock
index 75c9261f6..1ad1bbc86 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8621,22 +8621,10 @@ got@^6.7.1:
unzip-response "^2.0.1"
url-parse-lax "^1.0.0"
-graceful-fs@^3.0.0:
- version "3.0.11"
- resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.11.tgz#7613c778a1afea62f25c630a086d7f3acbbdd818"
- integrity sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=
- dependencies:
- natives "^1.1.0"
-
-graceful-fs@^4.0.0, graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
- version "4.1.11"
- resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
- integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
-
-graceful-fs@~1.2.0:
- version "1.2.3"
- resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-1.2.3.tgz#15a4806a57547cb2d2dbf27f42e89a8c3451b364"
- integrity sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=
+graceful-fs@4.1.15, graceful-fs@^3.0.0, graceful-fs@^4.0.0, graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@~1.2.0:
+ version "4.1.15"
+ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
+ integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
"graceful-readlink@>= 1.0.0":
version "1.0.1"
@@ -12528,11 +12516,6 @@ nanomatch@^1.2.9:
snapdragon "^0.8.1"
to-regex "^3.0.1"
-natives@^1.1.0:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.3.tgz#44a579be64507ea2d6ed1ca04a9415915cf75558"
- integrity sha512-BZGSYV4YOLxzoTK73l0/s/0sH9l8SHs2ocReMH1f8JYSh5FUWu4ZrKCpJdRkWXV6HFR/pZDz7bwWOVAY07q77g==
-
natural-compare@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"