diff --git a/.gitignore b/.gitignore index 772f0c98..433b7e50 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ client/yarn-error.log **/allure-results/ /test/unittest/out/ .task +.release diff --git a/.taskjob/win64.yaml b/.taskjob/win64.yaml index cce622ea..85193eaf 100644 --- a/.taskjob/win64.yaml +++ b/.taskjob/win64.yaml @@ -190,7 +190,7 @@ tasks: build_ui: desc: build ui - dir: client + dir: ui cmds: - yarn install - yarn build --dest ../client/ui diff --git a/client/package.json b/client/package.json index 82185357..086bd15a 100644 --- a/client/package.json +++ b/client/package.json @@ -1,7 +1,7 @@ { "name": "zd", "productName": "zd", - "version": "3.1.1", + "version": "3.2.0", "description": "zd", "main": ".webpack/main", "scripts": { diff --git a/win64.yaml b/win64.yaml index cce622ea..e3065805 100644 --- a/win64.yaml +++ b/win64.yaml @@ -121,7 +121,7 @@ tasks: compile_command_win64: desc: compile command win64 cmds: - - GOOS=windows GOARCH=amd64 go build -ldflags {{.LDFLAGS}} -o {{.BIN_DIR}}/win64/{{.PROJECT}}.exe cmd/command/main.go + - GOOS=windows GOARCH=amd64 go build -ldflags "{{.LDFLAGS}}" -o {{.BIN_DIR}}/win64/{{.PROJECT}}.exe cmd/command/main.go package_gui_win64_client: desc: package gui win64 client @@ -145,7 +145,7 @@ tasks: compile_server_win64: desc: compile server win64 cmds: - - GOOS=windows GOARCH=amd64 go build -ldflags {{.LDFLAGS}} -o {{.BIN_DIR}}/win64/server.exe cmd/server/main.go + - GOOS=windows GOARCH=amd64 go build -ldflags "{{.LDFLAGS}}" -o {{.BIN_DIR}}/win64/server.exe cmd/server/main.go - rm -rf {{.CLIENT_OUT_DIR_EXECUTABLE}}/win64 - mkdir -p {{.CLIENT_OUT_DIR_EXECUTABLE}}/win64 - cp {{.BIN_DIR}}/win64/server.exe {{.CLIENT_OUT_DIR_EXECUTABLE}}/win64/server.exe @@ -161,14 +161,13 @@ tasks: - task: compile_launcher_win64_dep dir: cmd/launcher cmds: - - GOOS=windows GOARCH=amd64 go build -ldflags {{.LDFLAGS}} -o ../../{{.BIN_DIR}}/win64/{{.PROJECT}}-gui.exe + - GOOS=windows GOARCH=amd64 go build -ldflags "{{.LDFLAGS}}" -o ../../{{.BIN_DIR}}/win64/{{.PROJECT}}-gui.exe prepare_build: desc: prepare build cmds: - task: clear - task: update_version_in_config - - task: gen_version_file - task: prepare_res prepare_res: @@ -176,21 +175,17 @@ tasks: cmds: - cp res/zh/sample.yaml demo/default.yaml - gen_version_file: - desc: gen version file - cmds: - - mkdir -p {{.QINIU_DIR}}/{{.PROJECT}} - update_version_in_config: desc: update version in config cmds: + - mkdir -p {{.QINIU_DIR}}/{{.PROJECT}} - sed -i "s/Version.*/Version = {{.VERSION}}/" .zd.conf - echo '{"version":"{{.VERSION}}"}' > {{.QINIU_DIR}}/{{.PROJECT}}/version.json - echo '{{.VERSION}}' > {{.QINIU_DIR}}/{{.PROJECT}}/version.txt build_ui: desc: build ui - dir: client + dir: ui cmds: - yarn install - yarn build --dest ../client/ui