From 1b85b2fca7b821bb8826e0926703bb5580cbb4b5 Mon Sep 17 00:00:00 2001 From: Leonard Gram Date: Mon, 21 May 2018 16:11:53 +0200 Subject: [PATCH] build: removes deploy from nightly while testing it. --- .circleci/config.yml | 10 +--------- scripts/build/download-phantomjs.sh | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e9660c18d58..c56df8e9cb5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -57,7 +57,6 @@ jobs: command: 'sudo npm install -g yarn --quiet' - restore_cache: key: dependency-cache-{{ checksum "yarn.lock" }} - # Could we skip this step if the cache has been restored? `[ -d node_modules ] || yarn install ...` should be able to apply to build step as well - run: name: yarn install command: 'yarn install --pure-lockfile --no-progress' @@ -221,9 +220,9 @@ workflows: filters: *filter-not-release - deploy-master: requires: + - build - test-backend - test-frontend - - build - codespell - gometalinter filters: @@ -264,10 +263,3 @@ workflows: - gometalinter - test-frontend - test-backend - - deploy-master: - requires: - - build-all - - codespell - - gometalinter - - test-frontend - - test-backend diff --git a/scripts/build/download-phantomjs.sh b/scripts/build/download-phantomjs.sh index 5738469cd2b..e346faf8765 100755 --- a/scripts/build/download-phantomjs.sh +++ b/scripts/build/download-phantomjs.sh @@ -1,7 +1,7 @@ #!/bin/bash -e if [ ! -d '/tmp/phantomjs' ]; then - _version="2.1.16" + _version="2.1.1" curl -L https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-$_version-windows.zip > /tmp/phantomjs-win.zip curl -L https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-$_version-macosx.zip > /tmp/phantomjs-mac.zip