diff --git a/.github/workflows/get-matrix.mjs b/.github/workflows/get-matrix.mjs index 644d57e4b..21c481071 100644 --- a/.github/workflows/get-matrix.mjs +++ b/.github/workflows/get-matrix.mjs @@ -10,8 +10,10 @@ const packagesPath = join(__dirname, '../../packages') for (const packagePath of await readdir(packagesPath)) { const pkg = join(packagesPath, packagePath, 'package.json') - const { name } = JSON.parse(await readFile(pkg)) - packages.push(name) + const { name, scripts } = JSON.parse(await readFile(pkg)) + if (scripts && scripts.test && scripts.test !== 'exit 0') { + packages.push(name) + } } console.log(`{"package":${JSON.stringify(packages)}}`) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index e4a98a64a..ba9bc3949 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -46,20 +46,21 @@ jobs: version: latest run_install: true - name: Test - run: pnpm run test --scope "${{ matrix.package }}" + run: pnpm --filter "${{ matrix.package }}" exec c8 pnpm test env: PROXY_USERNAME: ${{ secrets.PROXY_USERNAME }} PROXY_PASSWORD: ${{ secrets.PROXY_PASSWORD }} PROXY_HOST: ${{ secrets.PROXY_HOST }} - name: Coverage - run: pnpm run coverage + run: pnpm --filter "${{ matrix.package }}" exec c8 report --reporter=lcov --report-dir=coverage - name: Upload uses: coverallsapp/github-action@main with: flag-name: ${{ matrix.package }} parallel: true - allow-empty: true github-token: ${{ secrets.GITHUB_TOKEN }} + base-path: $(pnpm --filter "${{ matrix.package }}" exec pwd) + finish: needs: test runs-on: ubuntu-latest diff --git a/package.json b/package.json index 454d9d4b4..d29e64b0b 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,6 @@ "@commitlint/config-conventional": "latest", "@ksmithut/prettier-standard": "latest", "@lerna-lite/cli": "latest", - "@lerna-lite/exec": "latest", "@lerna-lite/publish": "latest", "browser-sync": "latest", "c8": "latest", @@ -115,11 +114,10 @@ }, "scripts": { "build": "gulp build", - "clean": "pnpm -r exec -- rm -rf node_modules", + "clean": "pnpm --recursive exec -- rm -rf node_modules", "contributors": "pnpm run contributors:add && pnpm run contributors:commit", "contributors:add": "pnpm --recursive --parallel exec -- finepack", "contributors:commit": "(git-authors-cli && finepack && git add package.json && git commit -m 'build: contributors' --no-verify) || true", - "coverage": "c8 report --reporter=text-lcov > coverage/lcov.info", "dev": "concurrently \"gulp\" \"npm run dev:server\"", "dev:server": "browser-sync start --server --files \"index.html, README.md, static/**/*.(css|js)\"", "lint": "standard", @@ -127,7 +125,7 @@ "prerelease": "pnpm run update:check", "pretest": "pnpm run lint", "release": "lerna publish --yes --sort --conventional-commits -m \"chore(release): %s\" --create-release github", - "test": "c8 lerna exec pnpm run test", + "test": "c8 pnpm --recursive --sequential test", "update": "pnpm --recursive --parallel exec ncu -u", "update:check": "pnpm --recursive --parallel exec ncu -errorLevel 2" },