Skip to content

Commit

Permalink
Merge branch 'master' into hn-karma
Browse files Browse the repository at this point in the history
  • Loading branch information
chris48s authored Dec 28, 2021
2 parents 88d851e + a86774b commit 216246e
Show file tree
Hide file tree
Showing 7 changed files with 221 additions and 541 deletions.
35 changes: 30 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ main_steps: &main_steps

- run:
name: Install dependencies
command: npm ci
command: |
npm install --dry-run
npm ci
environment:
# https://docs.cypress.io/guides/getting-started/installing-cypress.html#Skipping-installation
# We don't need to install the Cypress binary in jobs that aren't actually running Cypress.
Expand Down Expand Up @@ -47,7 +49,9 @@ integration_steps: &integration_steps

- run:
name: Install dependencies
command: npm ci
command: |
npm install --dry-run
npm ci
environment:
CYPRESS_INSTALL_BINARY: 0

Expand All @@ -68,7 +72,9 @@ services_steps: &services_steps

- run:
name: Install dependencies
command: npm ci
command: |
npm install --dry-run
npm ci
environment:
CYPRESS_INSTALL_BINARY: 0

Expand Down Expand Up @@ -138,6 +144,9 @@ jobs:
main:
docker:
- image: circleci/node:16
environment:
NPM_CONFIG_ENGINE_STRICT: 'true'
NPM_CONFIG_STRICT_PEER_DEPS: 'true'

<<: *main_steps

Expand All @@ -150,6 +159,9 @@ jobs:
integration:
docker:
- image: circleci/node:16
environment:
NPM_CONFIG_ENGINE_STRICT: 'true'
NPM_CONFIG_STRICT_PEER_DEPS: 'true'
- image: redis

<<: *integration_steps
Expand Down Expand Up @@ -184,12 +196,17 @@ jobs:
frontend:
docker:
- image: circleci/node:16
environment:
NPM_CONFIG_ENGINE_STRICT: 'true'
NPM_CONFIG_STRICT_PEER_DEPS: 'true'
steps:
- checkout

- run:
name: Install dependencies
command: npm ci
command: |
npm install --dry-run
npm ci
environment:
CYPRESS_INSTALL_BINARY: 0

Expand Down Expand Up @@ -225,6 +242,9 @@ jobs:
services:
docker:
- image: circleci/node:16
environment:
NPM_CONFIG_ENGINE_STRICT: 'true'
NPM_CONFIG_STRICT_PEER_DEPS: 'true'

<<: *services_steps

Expand All @@ -237,6 +257,9 @@ jobs:
e2e:
docker:
- image: cypress/base:16.13.0
environment:
NPM_CONFIG_ENGINE_STRICT: 'true'
NPM_CONFIG_STRICT_PEER_DEPS: 'true'
steps:
- checkout

Expand All @@ -247,7 +270,9 @@ jobs:

- run:
name: Install dependencies
command: npm ci
command: |
npm install --dry-run
npm ci
- run:
name: Frontend build
Expand Down
3 changes: 3 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ updates:
day: friday
time: '12:00'
open-pull-requests-limit: 99
ignore:
# https://github.com/badges/shields/pull/7288#issuecomment-974699240
- dependency-name: '@types/node'

# badge-maker package dependencies
- package-ecosystem: npm
Expand Down
Loading

0 comments on commit 216246e

Please sign in to comment.