Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

Fix Windows build on Node 14 #460

Merged
merged 6 commits into from
Jun 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 2 additions & 32 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
# node-version: [12.x, 14.x]
node-version: [12.x]
os: [ubuntu-latest, windows-latest, macOS-latest]
node-version: [12.x, 14.x]
os: [ubuntu-latest, macOS-latest, windows-latest]
steps:
- run: git config --global core.autocrlf false # this is needed to prevent git changing EOL after cloning on Windows OS
- uses: actions/checkout@v2
Expand Down Expand Up @@ -37,32 +36,3 @@ jobs:
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
path-to-lcov: ./lcov.info

npm-node14:
runs-on: ${{ matrix.os }}
strategy:
matrix:
node-version: [14.x]
os: [ubuntu-latest]
steps:
- run: git config --global core.autocrlf false # this is needed to prevent git changing EOL after cloning on Windows OS
- uses: actions/checkout@v2
- name: Use Node.js
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: Install with npm
run: |
npm install
- name: Lint code
run: |
npm run lint
- name: Build
run: |
npm run build
- name: Storybook build
run: |
npm run build-storybook
- name: Run tests
run: |
npm run test:ci
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"@types/node": "~14.0.13",
"@types/react": "~16.9.17",
"@types/react-dom": "~16.9.1",
"@types/react-table": "^7.0.4",
"@types/react-table": "~7.0.4",
"@types/sinon": "~9.0.0",
"@types/storybook__addon-info": "~5.2.0",
"@types/tinymce": "~4.5.23",
Expand Down Expand Up @@ -138,11 +138,11 @@
"@tinymce/tinymce-react": "~3.6.0",
"@types/react-bootstrap-typeahead": "^3.4.6",
"@types/react-datepicker": "~2.11.0",
"babel-jest": "^26.0.1",
"babel-jest": "~26.0.1",
"chart.js": "~2.9.3",
"date-fns": "^2.9.0",
"date-fns": "~2.9.0",
"formik": "~2.1.0",
"lodash": "^4.17.15",
"lodash": "~4.17.15",
"moment": "~2.26.0",
"react-bootstrap-typeahead": "^4.2.3",
"react-datepicker": "~3.0.0",
Expand Down