From f6bf9e42b44c34516042d73b8b3bd13ea9a34203 Mon Sep 17 00:00:00 2001 From: jarvisjiang Date: Mon, 13 May 2024 15:17:00 +0000 Subject: [PATCH] fix action errors --- .github/workflows/jsr-publish.yml | 38 ++++++++++-------- .../workflows/npm-publish-github-packages.yml | 40 ++++++++++--------- .github/workflows/npm-publish.yml | 38 +++++++++--------- .github/workflows/test.yml | 29 +++++++------- package.json | 13 +++--- 5 files changed, 84 insertions(+), 74 deletions(-) diff --git a/.github/workflows/jsr-publish.yml b/.github/workflows/jsr-publish.yml index 95014aa..e8a7fa4 100644 --- a/.github/workflows/jsr-publish.yml +++ b/.github/workflows/jsr-publish.yml @@ -7,27 +7,24 @@ on: - main jobs: - install: - runs-on: ubuntu-latest - - steps: - - uses: pnpm/action-setup@v4 - with: - version: 8 - test: - needs: install runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - name: Checkout + uses: actions/checkout@v4 + + - name: Install dependencies + uses: actions/setup-node@v4 with: - node-version: 20 - - uses: oven-sh/setup-bun@v1 + node-version: latest + - run: npm install pnpm -g + - run: pnpm install + + - name: Run test cases + uses: oven-sh/setup-bun@v1 with: bun-version: latest - - run: pnpm install - - run: npm test + - run: pnpm test publish-jsr: needs: test @@ -38,5 +35,12 @@ jobs: id-token: write steps: - - uses: actions/checkout@v4 - - run: npx jsr publish + - name: Checkout + uses: actions/checkout@v4 + + - name: Publish JSR + uses: actions/setup-node@v4 + with: + node-version: latest + - run: npm install jsr -g + - run: jsr publish diff --git a/.github/workflows/npm-publish-github-packages.yml b/.github/workflows/npm-publish-github-packages.yml index 0258c8d..c6a756b 100644 --- a/.github/workflows/npm-publish-github-packages.yml +++ b/.github/workflows/npm-publish-github-packages.yml @@ -8,40 +8,44 @@ on: types: [created] jobs: - install: - runs-on: ubuntu-latest - - steps: - - uses: pnpm/action-setup@v4 - with: - version: 8 - test: - needs: install runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - name: Checkout + uses: actions/checkout@v4 + + - name: Install dependencies + uses: actions/setup-node@v4 with: - node-version: 20 - - uses: oven-sh/setup-bun@v1 + node-version: latest + - run: npm install pnpm -g + - run: pnpm install + + - name: Run test cases + uses: oven-sh/setup-bun@v1 with: bun-version: latest - - run: pnpm install - - run: npm test + - run: pnpm test publish-gpr: needs: test runs-on: ubuntu-latest + permissions: contents: read packages: write + steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - name: Checkout + uses: actions/checkout@v4 + + - name: Publish Github package + uses: actions/setup-node@v4 with: - node-version: 20 + node-version: latest registry-url: https://npm.pkg.github.com/ + - run: npm install pnpm -g + - run: pnpm install - run: npm publish env: NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml index 18f88d9..c34d98b 100644 --- a/.github/workflows/npm-publish.yml +++ b/.github/workflows/npm-publish.yml @@ -8,37 +8,39 @@ on: types: [created] jobs: - install: - runs-on: ubuntu-latest - - steps: - - uses: pnpm/action-setup@v4 - with: - version: 8 - test: - needs: install runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - name: Checkout + uses: actions/checkout@v4 + + - name: Install dependencies + uses: actions/setup-node@v4 with: - node-version: 20 - - uses: oven-sh/setup-bun@v1 + node-version: latest + - run: npm install pnpm -g + - run: pnpm install + + - name: Run test cases + uses: oven-sh/setup-bun@v1 with: bun-version: latest - - run: pnpm install - - run: npm test + - run: pnpm test publish-npm: needs: test runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - name: Checkout + uses: actions/checkout@v4 + + - name: Publish npm package + uses: actions/setup-node@v4 with: - node-version: 20 + node-version: latest registry-url: https://registry.npmjs.org/ + - run: npm install pnpm -g + - run: pnpm install - run: npm publish env: NODE_AUTH_TOKEN: ${{secrets.npm_token}} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 963c115..aef74c1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,6 @@ # This workflow will run tests using bun and then upload the coverage reports to Codecov. -name: Test +name: Run Tests on: push: @@ -8,27 +8,26 @@ on: - main jobs: - install: + test: runs-on: ubuntu-latest steps: - - uses: pnpm/action-setup@v4 - with: - version: 8 + - name: Checkout + uses: actions/checkout@v4 - test: - needs: install - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - name: Install dependencies + uses: actions/setup-node@v4 with: - node-version: 20 - - uses: oven-sh/setup-bun@v1 + node-version: latest + - run: npm install pnpm -g + - run: pnpm install + + - name: Run test cases + uses: oven-sh/setup-bun@v1 with: bun-version: latest - - run: pnpm install - - run: npm test + - run: pnpm test + - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v4 with: diff --git a/package.json b/package.json index 65b4c27..db4115f 100644 --- a/package.json +++ b/package.json @@ -19,12 +19,12 @@ ], "sideEffects": false, "scripts": { - "check": "npx tsc --noEmit", - "lint": "npx eslint src/", - "prebuild": "npx rimraf dist && npm run check && npm run lint", - "build": "npx rollup --config rollup.config.mjs", + "check": "pnpm exec tsc --noEmit", + "lint": "pnpm exec eslint src/", + "prebuild": "pnpm exec rimraf dist && pnpm run check && pnpm run lint", + "build": "pnpm exec rollup --config rollup.config.mjs", "test": "bun test --coverage", - "prepublishOnly": "npm run build" + "prepublishOnly": "pnpm run build" }, "repository": { "type": "git", @@ -50,5 +50,6 @@ "rollup-plugin-dts": "^6.1.0", "rollup-plugin-esbuild": "^6.1.1", "typescript": "^5.4.5" - } + }, + "packageManager": "pnpm@9.1.1+sha512.14e915759c11f77eac07faba4d019c193ec8637229e62ec99eefb7cf3c3b75c64447882b7c485142451ee3a6b408059cdfb7b7fa0341b975f12d0f7629c71195" }