Skip to content

Commit

Permalink
Merge branch 'master' into renovate/eslint-stylistic-monorepo
Browse files Browse the repository at this point in the history
  • Loading branch information
jennifer-shehane authored Aug 12, 2024
2 parents 69c3655 + 461e649 commit 6ab70e2
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ cache:

# this job installs npm dependencies and Cypress
install:
image: cypress/base:20.15.1
image: cypress/base:20.16.0
stage: build

script:
Expand All @@ -35,7 +35,7 @@ install:

# all jobs that actually run tests can use the same definition
.job_template:
image: cypress/base:20.15.1
image: cypress/base:20.16.0
stage: test
script:
# print CI environment variables for reference
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# https://documentation.codeship.com/pro/languages-frameworks/nodejs/

# use Cypress provided image with all dependencies included
FROM cypress/base:20.15.1
FROM cypress/base:20.16.0
RUN node --version
RUN npm --version
WORKDIR /home/node/app
Expand Down
2 changes: 1 addition & 1 deletion basic/.circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2
jobs:
test:
docker:
- image: cypress/base:20.15.1
- image: cypress/base:20.16.0
steps:
- checkout
# restore folders with npm dependencies and Cypress binary
Expand Down
2 changes: 1 addition & 1 deletion basic/.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cache:
- cache/Cypress

test:
image: cypress/base:20.15.1
image: cypress/base:20.16.0
stage: test
script:
- npm ci
Expand Down
2 changes: 1 addition & 1 deletion basic/codeship-pro/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# https://documentation.codeship.com/pro/languages-frameworks/nodejs/

# use Cypress provided image with all dependencies included
FROM cypress/base:20.15.1
FROM cypress/base:20.16.0
RUN node --version
RUN npm --version
WORKDIR /home/node/app
Expand Down

0 comments on commit 6ab70e2

Please sign in to comment.