From a222c580478c32110ec6e95234f5e491628de53d Mon Sep 17 00:00:00 2001 From: Karsten Hassel Date: Mon, 21 Jun 2021 22:27:36 +0200 Subject: [PATCH] use --forceExit running jest, define timeouts for github workflows --- .github/workflows/codecov-test-suites.yml | 1 + .github/workflows/enforce-changelog.yml | 1 + .github/workflows/node-ci.js.yml | 1 + CHANGELOG.md | 2 +- package.json | 8 ++++---- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codecov-test-suites.yml b/.github/workflows/codecov-test-suites.yml index 0d98e3a0..1a6d4e0e 100644 --- a/.github/workflows/codecov-test-suites.yml +++ b/.github/workflows/codecov-test-suites.yml @@ -11,6 +11,7 @@ on: jobs: run-and-upload-coverage-report: runs-on: ubuntu-latest + timeout-minutes: 30 steps: - uses: actions/checkout@v2 - run: | diff --git a/.github/workflows/enforce-changelog.yml b/.github/workflows/enforce-changelog.yml index 67a95a48..d4a5a994 100644 --- a/.github/workflows/enforce-changelog.yml +++ b/.github/workflows/enforce-changelog.yml @@ -9,6 +9,7 @@ on: jobs: check: runs-on: ubuntu-latest + timeout-minutes: 10 steps: - uses: actions/checkout@v2 - uses: dangoslen/changelog-enforcer@v1.6.1 diff --git a/.github/workflows/node-ci.js.yml b/.github/workflows/node-ci.js.yml index 72ce8594..b5dd7aee 100644 --- a/.github/workflows/node-ci.js.yml +++ b/.github/workflows/node-ci.js.yml @@ -12,6 +12,7 @@ on: jobs: test: runs-on: ubuntu-latest + timeout-minutes: 30 strategy: matrix: node-version: [12.x, 14.x, 16.x] diff --git a/CHANGELOG.md b/CHANGELOG.md index ad819d31..97775851 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,7 +56,7 @@ Special thanks to the following contributors: @B1gG, @codac, @ezeholz, @khassel, - Fix config check failing when encountering let syntax ("Parsing error: Unexpected token config") - Fix calendar debug check - Really run prettier over all files -- Fix logger.js after jest changes +- Fix logger.js after jest changes, use --forceExit running jest ## [2.15.0] - 2021-04-01 diff --git a/package.json b/package.json index 5a2a419c..420f817a 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,10 @@ "install": "echo \"Installing vendor files ...\n\" && cd vendor && npm install --loglevel=error", "install-fonts": "echo \"Installing fonts ...\n\" && cd fonts && npm install --loglevel=error", "postinstall": "npm run install-fonts && echo \"MagicMirror installation finished successfully! \n\"", - "test": "NODE_ENV=test jest -i", - "test:coverage": "NODE_ENV=test nyc --reporter=lcov --reporter=text jest -i", - "test:e2e": "NODE_ENV=test jest --selectProjects e2e -i", - "test:unit": "NODE_ENV=test jest --selectProjects unit -i", + "test": "NODE_ENV=test jest -i --forceExit", + "test:coverage": "NODE_ENV=test nyc --reporter=lcov --reporter=text jest -i --forceExit", + "test:e2e": "NODE_ENV=test jest --selectProjects e2e -i --forceExit", + "test:unit": "NODE_ENV=test jest --selectProjects unit -i --forceExit", "test:prettier": "prettier . --check", "test:js": "eslint js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json --quiet", "test:css": "stylelint css/main.css modules/default/**/*.css --config .stylelintrc.json",