Skip to content

Commit

Permalink
Merge branch 'dev' into otp-ui-update-jan-24
Browse files Browse the repository at this point in the history
  • Loading branch information
miles-grant-ibigroup authored Feb 5, 2024
2 parents 073cdc1 + 843bcc3 commit ae4bfd5
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/node-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
with:
# This allows us to work with the repository during the lint step
fetch-depth: 2
- name: Use Node.js 16.x
- name: Use Node.js 21.x
uses: actions/setup-node@v1
with:
node-version: 16.x
node-version: 21.x
- name: Install npm packages using cache
uses: bahmutov/npm-install@v1
- name: Lint code
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/percy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
with:
# This allows us to work with the repository during the lint step
fetch-depth: 2
- name: Use Node.js 16.x
- name: Use Node.js 21.x
uses: actions/setup-node@v1
with:
node-version: 16.x
node-version: 21.x
- name: Install npm packages using cache
uses: bahmutov/npm-install@v1
- name: Build OTP-RR
Expand All @@ -39,10 +39,10 @@ jobs:
with:
# This allows us to work with the repository during the lint step
fetch-depth: 2
- name: Use Node.js 16.x
- name: Use Node.js 21.x
uses: actions/setup-node@v1
with:
node-version: 16.x
node-version: 21.x
- name: Install npm packages using cache
uses: bahmutov/npm-install@v1
- name: Download OTP2 config file
Expand Down
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"main": "build/index.js",
"scripts": {
"a11y-test": "jest a11y/ --runInBand --force-exit",
"build": "craco build",
"build": "NODE_OPTIONS=--openssl-legacy-provider craco build",
"check:i18n-en-fr": "node node_modules/@opentripplanner/scripts/lib/run-validate-i18n.js lib i18n/en-US.yml i18n/fr.yml",
"unit": "jest __tests__/",
"lint": "lint-staged",
Expand All @@ -16,14 +16,17 @@
"test": "yarn run lint && yarn run typecheck && yarn check:i18n-en-fr && yarn run unit",
"typecheck": "yarn tsc",
"semantic-release": "semantic-release",
"start": "craco start",
"start": "NODE_OPTIONS=--openssl-legacy-provider craco start",
"percy-serve": "serve",
"percy-har-express": "har-express",
"percy-combined-mock-server": "node ./percy/mock-server.js"
},
"standard": {
"parser": "babel-eslint"
},
"engines": {
"node": ">=16"
},
"repository": {
"type": "git",
"url": "https://github.com/opentripplanner/otp-react-redux.git"
Expand Down

0 comments on commit ae4bfd5

Please sign in to comment.