diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c0536de..8601a1c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,4 +1,4 @@ -name: Tests +name: test on: push: @@ -6,6 +6,9 @@ on: pull_request: branches: [ master ] +env: + CI: true + jobs: build: @@ -13,7 +16,7 @@ jobs: strategy: matrix: - node-version: [12.x, 14.x, 16.x] + node-version: [lts/*] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ env: MYSQL_DB_DATABASE: keyv_test @@ -58,12 +61,11 @@ jobs: sudo -u postgres psql --command="ALTER ROLE postgres WITH PASSWORD 'postgres';" --command="\du" sudo systemctl restart postgresql.service pg_isready - - run: npm install --no-package-lock - run: npm test - - name: Report - run: mkdir -p coverage && npx nyc report --reporter=text-lcov > coverage/lcov.info - name: Coverage + run: sudo apt-get install lcov && npm run coverage + - name: Upload uses: coverallsapp/github-action@master with: github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/package.json b/package.json index 70fcf15..b4b01ee 100644 --- a/package.json +++ b/package.json @@ -131,6 +131,7 @@ "build": "gulp build", "clean": "lerna clean --yes && rm -rf node_modules", "contributors": "(lerna exec finepack --parallel && git-authors-cli && finepack && git add package.json && git commit -m 'build: contributors' --no-verify) || true", + "coverage": "lerna run coverage && mkdir -p coverage && /usr/bin/find ./packages/* -type f ! -size 0 -name lcov.info -exec echo -a {} \\; | xargs lcov -o coverage/lcov.info", "dev": "concurrently \"gulp\" \"npm run dev:server\"", "dev:server": "browser-sync start --server --files \"index.html, README.md, static/**/*.(css|js)\"", "install": "lerna bootstrap --no-ci --force-local", @@ -138,7 +139,7 @@ "prerelease": "npm run contributors", "pretest": "npm run lint", "release": "lerna publish --yes --sort --conventional-commits -m \"chore(release): %s\" --create-release github", - "test": "lerna exec npm run test", + "test": "lerna run test", "update": "lerna exec ncu -- --upgrade && ncu -- --upgrade", "update:check": "lerna exec ncu -- --errorLevel 2 && ncu -- --errorLevel 2" }, diff --git a/packages/core/package.json b/packages/core/package.json index 3e1a87c..7db6a22 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -40,7 +40,8 @@ "src" ], "scripts": { - "test": "nyc --temp-dir ../../.nyc_output ava test/keyv.js" + "coverage": "mkdir -p coverage && nyc report --reporter=text-lcov > coverage/lcov.info", + "test": "nyc ava" }, "license": "MIT" } diff --git a/packages/memoize/package.json b/packages/memoize/package.json index 362cb56..82fa831 100644 --- a/packages/memoize/package.json +++ b/packages/memoize/package.json @@ -45,7 +45,8 @@ "src" ], "scripts": { - "test": "nyc --temp-dir ../../.nyc_output ava" + "coverage": "mkdir -p coverage && nyc report --reporter=text-lcov > coverage/lcov.info", + "test": "nyc ava" }, "license": "MIT" } diff --git a/packages/mongo/package.json b/packages/mongo/package.json index 8103e03..2373b56 100644 --- a/packages/mongo/package.json +++ b/packages/mongo/package.json @@ -46,7 +46,8 @@ "src" ], "scripts": { - "test": "nyc --temp-dir ../../.nyc_output ava" + "coverage": "mkdir -p coverage && nyc report --reporter=text-lcov > coverage/lcov.info", + "test": "nyc ava" }, "license": "MIT" } diff --git a/packages/mysql/package.json b/packages/mysql/package.json index 7e7fb21..b25ee1e 100644 --- a/packages/mysql/package.json +++ b/packages/mysql/package.json @@ -47,7 +47,8 @@ "src" ], "scripts": { - "test": "nyc --temp-dir ../../.nyc_output ava" + "coverage": "mkdir -p coverage && nyc report --reporter=text-lcov > coverage/lcov.info", + "test": "nyc ava" }, "license": "MIT" } diff --git a/packages/postgres/package.json b/packages/postgres/package.json index 4179e1d..7e1941f 100644 --- a/packages/postgres/package.json +++ b/packages/postgres/package.json @@ -47,7 +47,8 @@ "src" ], "scripts": { - "test": "nyc --temp-dir ../../.nyc_output ava --serial" + "coverage": "mkdir -p coverage && nyc report --reporter=text-lcov > coverage/lcov.info", + "test": "nyc ava --serial" }, "license": "MIT" } diff --git a/packages/redis/package.json b/packages/redis/package.json index 3ed4e87..ff81881 100644 --- a/packages/redis/package.json +++ b/packages/redis/package.json @@ -45,8 +45,9 @@ "src" ], "scripts": { + "coverage": "mkdir -p coverage && nyc report --reporter=text-lcov > coverage/lcov.info", "posttest:docker": "docker-compose down --rmi local", - "test": "nyc --temp-dir ../../.nyc_output ava", + "test": "nyc ava", "test:docker": "docker-compose up --build --abort-on-container-exit --exit-code-from test" }, "license": "MIT" diff --git a/packages/sql/package.json b/packages/sql/package.json index e137d8c..e8178db 100644 --- a/packages/sql/package.json +++ b/packages/sql/package.json @@ -45,7 +45,8 @@ "src" ], "scripts": { - "test": "nyc --temp-dir ../../.nyc_output ava" + "coverage": "mkdir -p coverage && nyc report --reporter=text-lcov > coverage/lcov.info", + "test": "nyc ava" }, "license": "MIT" } diff --git a/packages/sqlite/package.json b/packages/sqlite/package.json index 49f5dc9..8d4b9fa 100644 --- a/packages/sqlite/package.json +++ b/packages/sqlite/package.json @@ -47,7 +47,8 @@ "src" ], "scripts": { - "test": "nyc --temp-dir ../../.nyc_output ava" + "coverage": "mkdir -p coverage && nyc report --reporter=text-lcov > coverage/lcov.info", + "test": "nyc ava" }, "license": "MIT" }