release 6.1.0

CHANGELOG.md

@@ -1,6 +1,6 @@
 # 更新日志
 
-## 2024.01.31 v6.1.0
+## 2024.02.01 v6.1.0
 
 1. build指令增加参数确认环节
 2. 移除构建参数转码

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@gitmars/monorepo",
 	"description": "这是一个git工作流工具",
-	"version": "6.1.0-beta.1",
+	"version": "6.1.0",
 	"packageManager": "pnpm@8.7.4",
 	"main": "index.js",
 	"files": [

packages/core/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@gitmars/core",
 	"description": "gitmars核心程序",
-	"version": "6.1.0-beta.1",
+	"version": "6.1.0",
 	"private": false,
 	"main": "./lib/index.js",
 	"module": "./lib/index.mjs",

packages/docs/changelog.md

@@ -1,5 +1,11 @@
 # 更新日志
 
+## 2024.02.01 v6.1.0
+
+1. build指令增加参数确认环节
+2. 移除构建参数转码
+3. 升级依赖包
+
 ## 2024.01.08 v6.0.0
 
 1. 移除 `server` `ui` 两个子项目

packages/docs/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@gitmars/docs",
 	"description": "gitmars文档库",
-	"version": "6.1.0-beta.1",
+	"version": "6.1.0",
 	"private": false,
 	"files": [
 		"dist",

packages/gitmars/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "gitmars",
 	"description": "这是一个git工作流工具",
-	"version": "6.1.0-beta.1",
+	"version": "6.1.0",
 	"private": false,
 	"bin": {
 		"gitm": "lib/gitm.mjs"

packages/gitmars/src/gitm-admin.ts

@@ -683,6 +683,7 @@ publishProgram.action(
 								opt.build === true ? 'all' : opt.build
 							} ${opt.data ? ' --data ' + opt.data : ''}`,
 							config: {
+								stdio: 'inherit',
 								again: false,
 								success: t('Pulling up the build was successful'),
 								fail: t('Failed to pull up the build')
@@ -699,6 +700,7 @@ publishProgram.action(
 							opt.build === true ? 'all' : opt.build
 						} ${opt.data ? ' --data ' + opt.data : ''}`,
 						config: {
+							stdio: 'inherit',
 							again: false,
 							success: t('Pulling up the build was successful'),
 							fail: t('Failed to pull up the build')

packages/gitmars/src/gitm-build.ts

@@ -1,5 +1,6 @@
 #!/usr/bin/env ts-node
 import { program } from 'commander'
+import sh from 'shelljs'
 import inquirer from 'inquirer'
 import chalk from 'chalk'
 import { createArgs } from '@gitmars/core/lib/utils/command'
@@ -54,7 +55,8 @@ program.action(async (project: string, opt: GitmBuildOption): Promise<void> => {
 		message
 	})
 
-	confirm &&
+	if (!confirm) sh.exit(1)
+	else
 		runJenkins({
 			env: opt.env,
 			project,

packages/gitmars/src/gitm-combine.ts

@@ -229,6 +229,7 @@ program.action(async (type: string, name: string, opt: GitmBuildOption): Promise
 							opt.build === true ? 'all' : opt.build
 						} ${opt.data ? ' --data ' + opt.data : ''}`,
 						config: {
+							stdio: 'inherit',
 							again: false,
 							success: t('Pulling up the build was successful'),
 							fail: t('Failed to pull up the build')
@@ -594,6 +595,7 @@ program.action(async (type: string, name: string, opt: GitmBuildOption): Promise
 									opt.build === true ? 'all' : opt.build
 								} ${opt.data ? ' --data ' + opt.data : ''}`,
 								config: {
+									stdio: 'inherit',
 									again: false,
 									success: t('Pulling up the build was successful'),
 									fail: t('Failed to pull up the build')
@@ -609,6 +611,7 @@ program.action(async (type: string, name: string, opt: GitmBuildOption): Promise
 									opt.build === true ? 'all' : opt.build
 								} ${opt.data ? ' --data ' + opt.data : ''}`,
 								config: {
+									stdio: 'inherit',
 									again: false,
 									success: t('Pulling up the build was successful'),
 									fail: t('Failed to pull up the build')