From 1fbbd35847270b146c481623170cfbbcd3a74ed3 Mon Sep 17 00:00:00 2001 From: Whymarrh Whitby Date: Fri, 7 Dec 2018 10:41:43 -0330 Subject: [PATCH 1/2] Remove unused Travis CI config file --- .travis.yml | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c3e1ccf2ee..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,46 +0,0 @@ -# Travis CI runs are deactivated in favour of CircleCI build checks -# Turn to the CircleCI configuration in .circleci directory for changing build settings -sudo: false -os: - - linux - -language: node_js -node_js: - - "8" - - "9" - -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - -branches: - # We need to whitelist the branches which we want to have "push" automation. - # Pull request automation is not constrained to this set of branches. - only: - - master - -env: - global: - - DISPLAY=:99.0 - matrix: - - CXX=g++-4.8 TEST_SUITE=testBuildIntegrity - -matrix: - fast_finish: true - include: - - os: linux - node_js: "6" - env: CXX=g++-4.8 TEST_SUITE=lint - - os: linux - node_js: "6" - env: CXX=g++-4.8 TEST_SUITE=testState - - os: linux - node_js: "6" - env: CXX=g++-4.8 TEST_SUITE=testBlockchainBlockGasLimit - - os: linux - node_js: "6" - env: CXX=g++-4.8 TEST_SUITE=testBlockchainTotalDifficulty -script: npm run $TEST_SUITE From 64b261f992dda0ce7136d5dea43a7fc0eee159b5 Mon Sep 17 00:00:00 2001 From: Whymarrh Whitby Date: Fri, 7 Dec 2018 10:46:04 -0330 Subject: [PATCH 2/2] Only run coveralls cmd when token exists in env --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6a36807be0..a7fc7f4258 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "scripts": { "coverage": "nyc npm run coverageTests && nyc report --reporter=text-lcov > .nyc_output/lcov.info", "coverageTests": "tape ./tests/api/*.js ./tests/tester.js -s", - "coveralls": "npm run coverage && coveralls <.nyc_output/lcov.info", + "coveralls": "npm run coverage && if [ -n \"$COVERALLS_REPO_TOKEN\" ]; then coveralls <.nyc_output/lcov.info; fi", "testVM": "node ./tests/tester -v", "testStateByzantium": "npm run build:dist && node ./tests/tester -s --fork='Byzantium' --dist", "testStateConstantinople": "npm run build:dist && node ./tests/tester -s --fork='Constantinople' --dist",