Skip to content

Commit

Permalink
npm: stop using --legacy-peer-deps (#1293)
Browse files Browse the repository at this point in the history
* it looks like it's no longer required
* it seems to introduce inconsistent/unnecessary changes in package-lock.json
  • Loading branch information
alxndrsn authored Nov 14, 2024
1 parent 5873479 commit 2b97d63
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
find . -size +1000000c -not -path './.git/*' | grep .
[[ $? -eq 1 ]]
- run: make check-file-headers
- run: npm ci --legacy-peer-deps
- run: npm ci
- run: node lib/bin/create-docker-databases.js
- run: make test-ci
- store_test_results:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/oidc-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
with:
node-version: 20.17.0
cache: 'npm'
- run: npm ci --legacy-peer-deps
- run: npm ci
- run: FAKE_OIDC_ROOT_URL=http://localhost:9898 make fake-oidc-server-ci > fake-oidc-server.log &
- run: node lib/bin/create-docker-databases.js
- run: make test-oidc-integration
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/s3-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
with:
node-version: 20.17.0
cache: 'npm'
- run: npm ci --legacy-peer-deps
- run: npm ci
- run: node lib/bin/create-docker-databases.js
- name: E2E Test
timeout-minutes: 10
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/soak-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
with:
node-version: 20.17.0
cache: 'npm'
- run: npm ci --legacy-peer-deps
- run: npm ci
- run: node lib/bin/create-docker-databases.js
- name: Soak Test
timeout-minutes: 10
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/standard-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
with:
node-version: 20.10.0
cache: 'npm'
- run: npm ci --legacy-peer-deps
- run: npm ci
- run: node lib/bin/create-docker-databases.js
- name: E2E Test
timeout-minutes: 10
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/standard-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ jobs:
with:
node-version: 20.17.0
cache: 'npm'
- run: npm ci --legacy-peer-deps
- run: npm ci
- run: node lib/bin/create-docker-databases.js
- run: make test
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
default: base

node_modules: package.json
npm install --legacy-peer-deps
npm install
touch node_modules

.PHONY: node_version
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/oidc/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if [[ ${CI-} = true ]]; then
sudo apt-get install -y wait-for-it

log "Creating database users..."
npm ci --legacy-peer-deps
npm ci
node lib/bin/create-docker-databases.js

START_SERVICES=true
Expand Down

0 comments on commit 2b97d63

Please sign in to comment.