Skip to content

Commit

Permalink
Fix Dependabot
Browse files Browse the repository at this point in the history
Dependabot respects the `engine-strict` setting and is currently silently failing. This change removes it from being globally enabled; instead, it is enabled wherever we run `npm install` or `npm ci`.

Refs dependabot/dependabot-core#9277
  • Loading branch information
thewilkybarkid committed Dec 5, 2024
1 parent fe02408 commit fa4e84b
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 15 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
cache: ${{ !env.ACT && 'npm' || '' }}

- name: 'Install dependencies'
run: npm ci --ignore-scripts
run: npm ci --engine-strict --ignore-scripts

- name: 'Set up assets cache'
uses: actions/cache@v4.1.2
Expand Down Expand Up @@ -147,7 +147,7 @@ jobs:
cache: ${{ !env.ACT && 'npm' || '' }}

- name: 'Install dependencies'
run: npm ci --ignore-scripts
run: npm ci --engine-strict --ignore-scripts

- name: 'Run formatter'
run: npm run format
Expand All @@ -168,7 +168,7 @@ jobs:
cache: ${{ !env.ACT && 'npm' || '' }}

- name: 'Install dependencies'
run: npm ci --ignore-scripts
run: npm ci --engine-strict --ignore-scripts

- name: 'Run the linter'
run: npm run lint:css
Expand All @@ -192,7 +192,7 @@ jobs:
cache: ${{ !env.ACT && 'npm' || '' }}

- name: 'Install dependencies'
run: npm ci --ignore-scripts
run: npm ci --engine-strict --ignore-scripts

- name: 'Download assets manifest'
uses: actions/download-artifact@v4.1.8
Expand Down Expand Up @@ -238,7 +238,7 @@ jobs:
cache: ${{ !env.ACT && 'npm' || '' }}

- name: 'Install dependencies'
run: npm ci --ignore-scripts
run: npm ci --engine-strict --ignore-scripts

- name: 'Download assets manifest'
uses: actions/download-artifact@v4.1.8
Expand Down Expand Up @@ -278,7 +278,7 @@ jobs:
cache: ${{ !env.ACT && 'npm' || '' }}

- name: 'Install dependencies'
run: npm ci --ignore-scripts
run: npm ci --engine-strict --ignore-scripts

- name: 'Download assets'
uses: actions/download-artifact@v4.1.8
Expand Down Expand Up @@ -368,7 +368,7 @@ jobs:
cache: ${{ !env.ACT && 'npm' || '' }}

- name: 'Install dependencies'
run: npm ci --ignore-scripts
run: npm ci --engine-strict --ignore-scripts

- name: 'Download assets'
uses: actions/download-artifact@v4.1.8
Expand Down Expand Up @@ -419,7 +419,7 @@ jobs:
cache: ${{ !env.ACT && 'npm' || '' }}

- name: 'Install dependencies'
run: npm ci --ignore-scripts
run: npm ci --engine-strict --ignore-scripts

- name: 'Install browser dependencies'
run: npx playwright install-deps
Expand Down Expand Up @@ -455,7 +455,7 @@ jobs:
cache: ${{ !env.ACT && 'npm' || '' }}

- name: 'Install dependencies'
run: npm ci --ignore-scripts
run: npm ci --engine-strict --ignore-scripts

- name: 'Download assets manifest'
uses: actions/download-artifact@v4.1.8
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fix-playwright-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
cache: ${{ !env.ACT && 'npm' || '' }}

- name: 'Install dependencies'
run: npm ci --ignore-scripts
run: npm ci --engine-strict --ignore-scripts

- name: 'Fix Playwright versions'
run: scripts/fix-playwright-versions.sh
Expand Down
1 change: 0 additions & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@jsr:registry=https://npm.jsr.io
audit = false
engine-strict = true
fund = false
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ RUN chmod +x /usr/local/bin/intlc
FROM npm AS npm-dev
ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1

RUN npm ci --ignore-scripts
RUN npm ci --engine-strict --ignore-scripts

#
# Stage: Production NPM install
#
FROM npm AS npm-prod

RUN npm ci --ignore-scripts --production
RUN npm ci --engine-strict --ignore-scripts --production

#
# Stage: Intlc build
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ clean:
rm -rf .cache dist integration-results node_modules assets/locales src/locales src/manifest.json .dev/server.crt .dev/server.key

node_modules: package.json package-lock.json
npm install --ignore-scripts
npm install --engine-strict --ignore-scripts
touch node_modules

check: format lint-ts lint-css typecheck test-fast
Expand Down
2 changes: 1 addition & 1 deletion scripts/fix-playwright-versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version=$(npm list --depth=0 --json --package-lock-only | jq --raw-output '.depe
echo "Found @playwright/test $version"

echo "Updating all copies of playwright-core"
npm install playwright@"$version" playwright-core@"$version" --save-dev --save-exact --ignore-scripts
npm install playwright@"$version" playwright-core@"$version" --save-dev --save-exact --engine-strict --ignore-scripts
npm uninstall playwright playwright-core --save-dev

echo "Updating Dockerfile"
Expand Down

0 comments on commit fa4e84b

Please sign in to comment.