From 903777044afa5a815819a728f9bc7e1a19c037df Mon Sep 17 00:00:00 2001 From: dannyrb Date: Fri, 15 Nov 2019 10:21:47 -0500 Subject: [PATCH 1/2] Use an existing docker hub image --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 718f96500..064181a02 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,7 +18,7 @@ executors: # Custom executor to override Cypress config deploy-to-prod-executor: docker: - - image: 'cypress/browsers:chrome76' + - image: 'cypress/browsers:node10.16.0-chrome77' environment: CYPRESS_BASE_URL: https://ohif-staging.netlify.com/ From 9a626a20641dc2f1b90f68139ed1b14e629d8aa2 Mon Sep 17 00:00:00 2001 From: dannyrb Date: Fri, 15 Nov 2019 10:31:16 -0500 Subject: [PATCH 2/2] Switch to npx instead of digging into npm bin location --- .circleci/build-and-publish-docs.sh | 2 +- .circleci/config.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/build-and-publish-docs.sh b/.circleci/build-and-publish-docs.sh index ee21f1255..f86b3fcc4 100644 --- a/.circleci/build-and-publish-docs.sh +++ b/.circleci/build-and-publish-docs.sh @@ -62,7 +62,7 @@ echo "Done generating documentation output" echo 'STARTING PUBLISH' # WILL ALWAYS FAIL IF INITIATED FROM PR BRANCH -./node_modules/.bin/gh-pages \ +npx gh-pages \ --silent \ --repo https://$GITHUB_TOKEN@github.com/OHIF/Viewers.git \ --message 'Autogenerated Message: [ci skip]' \ diff --git a/.circleci/config.yml b/.circleci/config.yml index 064181a02..1f065eeb6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -284,7 +284,8 @@ jobs: name: Build and push Docker image command: | # This file will exist if a new version was published by - # our `semantic-release` command in the previous job + # our command in the previous job. Created in npm postpublish hook + # in the `platform/viewer` project. if [[ ! -e platform/viewer/success_version.txt ]]; then exit 0 else