Skip to content

Commit

Permalink
Merge branch 'main' into chore/bump-node
Browse files Browse the repository at this point in the history
  • Loading branch information
stefreak committed Nov 7, 2023
2 parents 80e4a58 + d2fd08c commit ceaf0f2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
8 changes: 5 additions & 3 deletions .circleci/continue-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,10 @@ commands:
- restore_cache:
keys:
# Prefer using the NPM cache for the package-lock hash, but fall back to any other cache too
- npm-v6-<<parameters.context>>-{{ checksum "package-lock.json" }}
- npm-v6-<<parameters.context>>
- npm-v7-<<parameters.context>>-{{ checksum "package-lock.json" }}
# If you uncomment the next line, we also restore caches if package-lock.json changed in case there is no exact match.
# We decided not to do that for now for enhanced safety: Every time we update the lock file, we build the caches from scratch. Might be a little paranoid, but hardens against possible NPM bugs.
#- npm-v7-<<parameters.context>>

- run:
name: Install NodeJS
Expand Down Expand Up @@ -140,7 +142,7 @@ commands:
- run: npm ci --prefer-offline --cache ~/.npm --no-audit

- save_cache:
key: npm-v6-<<parameters.context>>-{{ checksum "package-lock.json" }}
key: npm-v7-<<parameters.context>>-{{ checksum "package-lock.json" }}
paths:
- ~/.npm
- ~/.fnm
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@
"scripts": {
"add-licenses": "copyright-header --license-file support/license-header.txt --syntax support/license-syntax.yaml --add-path core/src:core/test --output-dir .",
"bootstrap": "npm install",
"build": "npm run clean && npm run bootstrap && ./scripts/run-script.ts build",
"build": "./scripts/run-script.ts build",
"clean-build": "npm run clean && npm run bootstrap && ./scripts/run-script.ts build",
"check-all": "npm run check-package-lock && npm run lint && npm run check-docs",
"check-docs": "./scripts/check-docs.sh",
"check-package-licenses": "./scripts/check-package-licenses.ts",
Expand Down
2 changes: 1 addition & 1 deletion scripts/check-docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# Needs to generate clean docs before we can validate they are up to date
npm run generate-docs
git diff --quiet HEAD -- docs/ || (echo 'generated docs are not up-to-date! run \"npm run build && npm run generate-docs\" and commit the changes\n' && exit 1)
git diff --quiet HEAD -- docs/ || (echo 'generated docs are not up-to-date! run \"npm run clean-build && npm run generate-docs\" and commit the changes.\n' && exit 1)

# Use "|| true" so we don't exit on empty
modified_docs=$(git diff --name-status main docs README.md) || true
Expand Down

0 comments on commit ceaf0f2

Please sign in to comment.