From 6a45b7329548c43de246e3282a31782626ec4294 Mon Sep 17 00:00:00 2001 From: saqqdy Date: Fri, 10 May 2024 21:00:06 +0800 Subject: [PATCH] release v7.0.1 --- .github/workflows/publish-test.yml | 2 ++ .github/workflows/publish.yml | 2 ++ CHANGELOG.md | 4 ++++ package.json | 2 +- packages/api/package.json | 2 +- packages/build/package.json | 2 +- packages/cache/package.json | 2 +- packages/core/package.json | 2 +- packages/core/src/versionControl.ts | 2 +- packages/docs/changelog.md | 4 ++++ packages/docs/package.json | 2 +- packages/git/package.json | 2 +- packages/gitmars/package.json | 2 +- packages/go/package.json | 2 +- packages/hook/package.json | 2 +- packages/utils/package.json | 2 +- 16 files changed, 24 insertions(+), 12 deletions(-) diff --git a/.github/workflows/publish-test.yml b/.github/workflows/publish-test.yml index 820b82fa..4efbca37 100644 --- a/.github/workflows/publish-test.yml +++ b/.github/workflows/publish-test.yml @@ -27,6 +27,8 @@ jobs: cache: pnpm - run: echo ${{ matrix.node-version }} + - run: npm i -g npm@8 + - run: node -v - run: npm -v - run: pnpm store path - run: pnpm install diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 4a9125ec..ba9499d3 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -29,6 +29,8 @@ jobs: cache: pnpm - run: echo ${{ matrix.node-version }} + - run: npm i -g npm@8 + - run: node -v - run: npm -v - run: pnpm store path - run: pnpm install diff --git a/CHANGELOG.md b/CHANGELOG.md index 91e9a2c8..34a969e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # 更新日志 +## 2024.05.10 v7.0.1 + +1. 修复版本控制BUG + ## 2024.05.10 v7.0.0 1. 重构项目，合理规划代码 diff --git a/package.json b/package.json index 2ba4d4ec..d0d0796a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/monorepo", "description": "这是一个git工作流工具", - "version": "7.0.0", + "version": "7.0.1", "packageManager": "pnpm@9.1.0", "main": "index.js", "files": [ diff --git a/packages/api/package.json b/packages/api/package.json index eadf5ceb..9ec99de1 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/api", "description": "gitmars api", - "version": "7.0.0", + "version": "7.0.0-beta.34", "private": false, "main": "./dist/index.cjs.js", "module": "./dist/index.esm-bundler.js", diff --git a/packages/build/package.json b/packages/build/package.json index d5ec020c..24ea2af4 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/build", "description": "gitmars build", - "version": "7.0.0", + "version": "7.0.0-beta.34", "private": false, "main": "./dist/index.cjs.js", "module": "./dist/index.esm-bundler.js", diff --git a/packages/cache/package.json b/packages/cache/package.json index 33e3a7d2..6a5ba7ed 100644 --- a/packages/cache/package.json +++ b/packages/cache/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/cache", "description": "gitmars cache", - "version": "7.0.0", + "version": "7.0.0-beta.34", "private": false, "main": "./dist/index.cjs.js", "module": "./dist/index.esm-bundler.js", diff --git a/packages/core/package.json b/packages/core/package.json index 7b3bd9ca..bb8c5bb7 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/core", "description": "gitmars核心程序", - "version": "7.0.0", + "version": "7.0.0-beta.34", "private": false, "main": "./dist/index.cjs.js", "module": "./dist/index.esm-bundler.js", diff --git a/packages/core/src/versionControl.ts b/packages/core/src/versionControl.ts index 2d64e0ab..c5f57875 100644 --- a/packages/core/src/versionControl.ts +++ b/packages/core/src/versionControl.ts @@ -53,7 +53,7 @@ export async function isNeedUpgrade(type?: VersionControlType): Promise const semverTag = semverDiff(version, tagVersion) if (!type) return false - if (isPreVer) return !!semverTag + if (isPreVer) return Boolean(semver || semverTag) else if (!semver) return false return ( (type === 'patch' && diff --git a/packages/docs/changelog.md b/packages/docs/changelog.md index 91e9a2c8..34a969e8 100644 --- a/packages/docs/changelog.md +++ b/packages/docs/changelog.md @@ -1,5 +1,9 @@ # 更新日志 +## 2024.05.10 v7.0.1 + +1. 修复版本控制BUG + ## 2024.05.10 v7.0.0 1. 重构项目，合理规划代码 diff --git a/packages/docs/package.json b/packages/docs/package.json index 5fd4edce..4ba220ac 100644 --- a/packages/docs/package.json +++ b/packages/docs/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/docs", "description": "gitmars文档库", - "version": "7.0.0", + "version": "7.0.0-beta.34", "private": false, "files": [ "dist", diff --git a/packages/git/package.json b/packages/git/package.json index de087da0..edefed45 100644 --- a/packages/git/package.json +++ b/packages/git/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/git", "description": "gitmars git", - "version": "7.0.0", + "version": "7.0.0-beta.34", "private": false, "main": "./dist/index.cjs.js", "module": "./dist/index.esm-bundler.js", diff --git a/packages/gitmars/package.json b/packages/gitmars/package.json index 4f24e5cd..35e356d9 100644 --- a/packages/gitmars/package.json +++ b/packages/gitmars/package.json @@ -2,7 +2,7 @@ "name": "gitmars", "description": "这是一个git工作流工具", "type": "module", - "version": "7.0.0", + "version": "7.0.0-beta.34", "private": false, "bin": { "gitm": "lib/gitm.mjs" diff --git a/packages/go/package.json b/packages/go/package.json index b97e5dfa..2cc32fc1 100644 --- a/packages/go/package.json +++ b/packages/go/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/go", "description": "gitmars go", - "version": "7.0.0", + "version": "7.0.0-beta.34", "private": false, "main": "./dist/index.cjs.js", "module": "./dist/index.esm-bundler.js", diff --git a/packages/hook/package.json b/packages/hook/package.json index cd996616..7add5383 100644 --- a/packages/hook/package.json +++ b/packages/hook/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/hook", "description": "gitmars hook", - "version": "7.0.0", + "version": "7.0.0-beta.34", "private": false, "main": "./dist/index.cjs.js", "module": "./dist/index.esm-bundler.js", diff --git a/packages/utils/package.json b/packages/utils/package.json index 4c7e9b6b..63b0b88a 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/utils", "description": "gitmars utils", - "version": "7.0.0", + "version": "7.0.0-beta.34", "private": false, "main": "./dist/index.cjs.js", "module": "./dist/index.esm-bundler.js",