From defc4f0e4a824e57b074bc15974476bdb2cffc3f Mon Sep 17 00:00:00 2001 From: Joe Hildebrand Date: Thu, 6 Feb 2025 13:28:33 -0700 Subject: [PATCH] Switch back to coveralls. Fix pnpm audit issue. --- .github/workflows/node.js.yml | 25 ++++++++++++++++++------- .github/workflows/publish.yml | 1 + package.json | 5 +++++ pnpm-lock.yaml | 15 ++++----------- 4 files changed, 28 insertions(+), 18 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index fcdb235..db97630 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -7,10 +7,6 @@ on: pull_request: branches: - main - workflow_call: - secrets: - CODECOV_TOKEN: - required: true jobs: build: @@ -42,7 +38,22 @@ jobs: run: npm run lint - name: Test run: npm run ci - - name: Upload coverage reports to Codecov - uses: codecov/codecov-action@v5 + # Stay on coveralls instead of codecov, since hildjj doesn't own the + # repo directly, and it's too much work to figure out. + - name: Coveralls Parallel + uses: coverallsapp/github-action@master with: - token: ${{ secrets.CODECOV_TOKEN }} + github-token: ${{ secrets.github_token }} + flag-name: node-${{ matrix.node-version }} + path-to-lcov: ./coverage/lcov.info + parallel: true + finish: + needs: build + runs-on: ubuntu-latest + steps: + - name: Coveralls Finished + uses: coverallsapp/github-action@master + with: + github-token: ${{ secrets.github_token }} + path-to-lcov: ./coverage/lcov.info + parallel-finished: true diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b4995b4..8cc8549 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -26,6 +26,7 @@ jobs: cache: pnpm - run: pnpm i -r - run: npm run build + - run: npm pkg delete devDependencies scripts packageManager pnpm - run: npm publish --access public --provenance env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/package.json b/package.json index 48dd985..debc233 100644 --- a/package.json +++ b/package.json @@ -65,5 +65,10 @@ "packageManager": "pnpm@10.2.0", "engines": { "node": ">=18" + }, + "pnpm": { + "overrides": { + "cross-spawn": "7.0.6" + } } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index affa0a6..d3c72e7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,6 +4,9 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false +overrides: + cross-spawn: 7.0.6 + importers: .: @@ -416,10 +419,6 @@ packages: convert-source-map@2.0.0: resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==} - cross-spawn@7.0.3: - resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} - engines: {node: '>= 8'} - cross-spawn@7.0.6: resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==} engines: {node: '>= 8'} @@ -1471,12 +1470,6 @@ snapshots: convert-source-map@2.0.0: {} - cross-spawn@7.0.3: - dependencies: - path-key: 3.1.1 - shebang-command: 2.0.0 - which: 2.0.2 - cross-spawn@7.0.6: dependencies: path-key: 3.1.1 @@ -1670,7 +1663,7 @@ snapshots: foreground-child@3.3.0: dependencies: - cross-spawn: 7.0.3 + cross-spawn: 7.0.6 signal-exit: 4.1.0 fsevents@2.3.3: