From 7228eff74ac300c161f0bd745bc7c012b5803916 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Sat, 30 Jan 2021 15:19:31 +0100 Subject: [PATCH] fix test run on Windows --- .github/workflows/ci.yml | 6 ++--- package-lock.json | 52 ++++++++++++++++++++++++++++++++++++++++ package.json | 3 ++- 3 files changed, 56 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 03c3fc7..cdced38 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v2 with: node-version: ${{ matrix.node }} @@ -32,9 +32,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-node@v1 - with: - node-version: '12' + - uses: actions/setup-node@v2 - run: npm i - uses: paambaati/codeclimate-action@v2.2.4 env: diff --git a/package-lock.json b/package-lock.json index d18c579..1665467 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10725,6 +10725,58 @@ "sha.js": "^2.4.8" } }, + "cross-env": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", + "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", + "dev": true, + "requires": { + "cross-spawn": "^7.0.1" + }, + "dependencies": { + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + } + } + }, "cross-fetch": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.6.tgz", diff --git a/package.json b/package.json index da41969..ed305d1 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "postinstall": "electron-builder install-app-deps", "test": "npm run lint && npm run jest", "test:watch": "npm run jest -- --watch", - "jest": "NODE_ENV=test jest -c tests/jest.config.js", + "jest": "cross-env NODE_ENV=test jest -c tests/jest.config.js", "lint": "eslint --ignore-path .gitignore --ext .js --ext .jsx .", "format": "prettier --write --ignore-path .gitignore 'src/**/*.{js,jsx,json,css,scss}'", "release": "release-it", @@ -49,6 +49,7 @@ "@testing-library/react": "^11.2.3", "auto-changelog": "^2.2.1", "babel-jest": "^26.6.3", + "cross-env": "^7.0.3", "dotenv": "^8.2.0", "electron": "10.1.3", "electron-builder": "^22.9.1",