From 54284c02b620fb43805799bd2fb69783fb5c0f11 Mon Sep 17 00:00:00 2001 From: yann300 Date: Wed, 5 Apr 2017 11:05:51 +0200 Subject: [PATCH] don't call makeMockCompiler for normal build --- .travis.yml | 2 +- ci/browser_tests.sh | 1 - package.json | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 723fd11bd5..2576695c75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: node_js node_js: - stable script: - - npm run lint && npm run csslint && npm run test && npm run downloadsolc && npm run build + - npm run lint && npm run csslint && npm run test && npm run downloadsolc && npm run make-mock-compiler && npm run build - ./ci/browser_tests.sh deploy: provider: script diff --git a/ci/browser_tests.sh b/ci/browser_tests.sh index d9fe75655e..1a8e1928f0 100755 --- a/ci/browser_tests.sh +++ b/ci/browser_tests.sh @@ -10,7 +10,6 @@ SAUCECONNECT_JOBIDENTIFIER="browsersolidity_tests_${TRAVIS_JOB_NUMBER}" SAUCECONNECT_READYFILE="sc.ready" TEST_EXITCODE=0 -node ci/makeMockCompiler.js npm run serve & wget "$SAUCECONNECT_URL" diff --git a/package.json b/package.json index 573381b810..7cf1339a8f 100644 --- a/package.json +++ b/package.json @@ -151,14 +151,14 @@ "nightwatch_remote_parallel": "nightwatch --config nightwatch.js --env ie,safari,chrome,default", "nightwatch_remote_safari": "nightwatch --config nightwatch.js --env safari", "onchange": "onchange build/app.js -- npm-run-all lint", - "prepublish": "mkdirp build; npm-run-all -ls downloadsolc make-mock-compiler build", + "prepublish": "mkdirp build; npm-run-all -ls downloadsolc build", "selenium": "execr --silent selenium-standalone start", "selenium-install": "selenium-standalone install", "serve": "execr --silent http-server .", "sourcemap": "exorcist --root ../ build/app.js.map > build/app.js", "start": "npm-run-all -lpr serve watch onchange", "test": "standard; npm run csslint; node test/index.js", - "test-browser": "npm-run-all -lpr selenium serve browsertest", + "test-browser": "npm-run-all -lpr selenium downloadsolc make-mock-compiler serve browsertest", "watch": "watchify src/index.js -dv --delay 0 -p browserify-reload -o '| npm run sourcemap'" } }