diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ec4d3a..1dd2f14 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: - name: Install pnpm uses: pnpm/action-setup@v2 with: - version: 7 + version: 8 - name: Set node uses: actions/setup-node@v3 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index cd34099..e1dfbad 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,7 +15,7 @@ jobs: - name: Install pnpm uses: pnpm/action-setup@v2 with: - version: 7 + version: 8 - name: Set node uses: actions/setup-node@v3 @@ -24,7 +24,7 @@ jobs: cache: pnpm - name: Install - run: pnpm i + run: pnpm install --no-frozen-lockfile - name: Build run: pnpm build -a diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1bf87f9..29b9b49 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: - name: Install pnpm uses: pnpm/action-setup@v2 with: - version: 7 + version: 8 - name: Set node uses: actions/setup-node@v3 @@ -24,7 +24,7 @@ jobs: cache: pnpm - name: Install - run: pnpm i + run: pnpm install --no-frozen-lockfile - name: Build Release Assets run: pnpm build:assets diff --git a/package.json b/package.json index 1e30823..f547979 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "axios-miniprogram", - "version": "2.5.0", + "version": "2.6.0", "description": "基于 Promise 的 HTTP 请求库,适用于各大小程序平台。", "main": "dist/axios-miniprogram.cjs.js", "module": "dist/axios-miniprogram.esm.js", @@ -27,7 +27,7 @@ "type": "module", "engines": { "node": ">=16", - "pnpm": ">=7" + "pnpm": ">=8" }, "scripts": { "cz": "simple-git-hooks && czg", diff --git a/scripts/release.ts b/scripts/release.ts index 000a8c6..7a2c200 100644 --- a/scripts/release.ts +++ b/scripts/release.ts @@ -27,10 +27,10 @@ async function main() { exec(`git tag -a v${version} -m "v${version}"`); consola.info('Git push'); - exec('git push'); + exec('git push -f'); consola.info('Git push tag'); - exec(`git push origin v${version}`); + exec(`git push -f origin v${version}`); } function checkBranch() {