From d22fac7f4e8be787f2b438a0e069a918bc9f0998 Mon Sep 17 00:00:00 2001 From: Ben Junya Date: Thu, 23 May 2019 17:09:58 -0700 Subject: [PATCH] Change Cypress versions in CircleCI and Dockerfile --- .circleci/config.yml | 4 ++-- web/app/cypress/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6442b905a..ef9ff81ad 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -118,7 +118,7 @@ jobs: # update cache key below name: Install Cypress 3.1.0 working_directory: ~/ship/web/app - command: npm install cypress@3.1.0 + command: npm install cypress@3.2.0 - run: name: Verify Cypress working_directory: ~/ship/web/app @@ -127,7 +127,7 @@ jobs: paths: - ~/.cache/Cypress - web/app/node_modules/cypress - key: ship-e2e-setup-cy-3.1.0 + key: ship-e2e-setup-cy-3.2.0 e2e_init: docker: - image: cypress/browsers:node8.9.3-chrome73 diff --git a/web/app/cypress/Dockerfile b/web/app/cypress/Dockerfile index d2361a844..231c08197 100644 --- a/web/app/cypress/Dockerfile +++ b/web/app/cypress/Dockerfile @@ -11,7 +11,7 @@ FROM cypress/browsers:node8.9.3-chrome73 # Instead, pull binary directly # TODO: Verify checksum of binary # See https://github.com/cypress-io/cypress/issues/812 -RUN curl https://download.cypress.io/desktop/3.1.0?platform=linux64 -L -o cypress.zip +RUN curl https://download.cypress.io/desktop/3.2.0?platform=linux64 -L -o cypress.zip RUN mkdir -p /Cypress/3.1.0 RUN unzip -q cypress.zip -d /Cypress/3.1.0 ENV CYPRESS_CACHE_FOLDER=/Cypress @@ -20,6 +20,6 @@ WORKDIR /repo ADD web/app/cypress.json /repo/web/app/cypress.json ADD web/app/cypress /repo/web/app/cypress ADD Makefile /repo/Makefile -RUN CYPRESS_INSTALL_BINARY=0 CI=true npm i cypress@3.1.0 +RUN CYPRESS_INSTALL_BINARY=0 CI=true npm i cypress@3.2.0 COPY --from=build-step /go/src/github.com/replicatedhq/ship/bin/ship /repo/bin/ship CMD ["make", "cypress_base"]