From f1575edc3da2013772cf16ef350d7c78cda0adbf Mon Sep 17 00:00:00 2001 From: ysicing Date: Mon, 5 Aug 2024 15:31:50 +0800 Subject: [PATCH] * [ci]: update makefile --- .github/workflows/test.yml | 4 +--- Makefile | 31 ------------------------------- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ed91a42b..734b69d6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -44,9 +44,7 @@ jobs: - name: install tools run: | echo "install tools" - go install github.com/go-task/task/v3/cmd/task@latest go install github.com/kevinburke/go-bindata/v4/...@latest - - name: Run task + - name: Release run: | - echo "Run task" make default diff --git a/Makefile b/Makefile index 816f9159..8ae39d12 100644 --- a/Makefile +++ b/Makefile @@ -36,13 +36,11 @@ server_win64: prepare compile_server_win64 copy_files_win64 zip_server_w server_linux: prepare compile_server_linux copy_files_linux zip_server_linux server_linux_arm64: prepare compile_server_linux_arm64 copy_files_linux_arm64 zip_server_linux_arm64 server_mac: prepare compile_server_mac copy_files_mac zip_server_mac -server_mac_arm64: prepare compile_server_mac_arm64 copy_files_mac_arm64 zip_server_mac_arm64 win64: prepare compile_server_win64 package_gui_win64_client compile_launcher_win64 compile_command_win64 copy_files_win64 zip_server_win64 zip_client_win64 linux: prepare compile_server_linux package_gui_linux_client compile_command_linux copy_files_linux zip_server_linux zip_client_linux linux_arm64: prepare compile_server_linux_arm64 package_gui_linux_client_arm64 compile_command_linux_arm64 copy_files_linux_arm64 zip_server_linux_arm64 zip_client_linux_arm64 mac: prepare compile_server_mac package_gui_mac_client compile_command_mac copy_files_mac zip_server_mac zip_client_mac -mac_arm64: prepare compile_server_mac_arm64 package_gui_mac_client_arm64 compile_command_mac_arm64 copy_files_mac_arm64 zip_server_mac_arm64 zip_client_mac_arm64 prepare: update_version prepare_res update_version: update_version_in_config gen_version_file @@ -112,13 +110,6 @@ compile_server_mac: ${BUILD_CMD} \ -o ${COMMAND_BIN_DIR}darwin/${PROJECT}-server ${SERVER_MAIN_FILE} -compile_server_mac_arm64: - @echo 'start compile mac arm64' - @rm -rf ${COMMAND_BIN_DIR}darwin_arm64/${PROJECT}-server - @GOOS=darwin GOARCH=arm64 \ - ${BUILD_CMD} \ - -o ${COMMAND_BIN_DIR}darwin_arm64/${PROJECT}-server ${SERVER_MAIN_FILE} - # gui package_gui_win64_client: @echo 'start package gui win64' @@ -157,16 +148,6 @@ package_gui_mac_client: mv ${CLIENT_OUT_DIR}${PROJECT}-darwin-x64 ${CLIENT_OUT_DIR}darwin/gui && \ mv ${CLIENT_OUT_DIR}darwin/gui/ztf.app ${CLIENT_OUT_DIR}darwin/ztf.app && rm -rf ${CLIENT_OUT_DIR}darwin/gui -package_gui_mac_client_arm64: - @echo 'start package gui mac arm64' - @rm -rf ${CLIENT_BIN_DIR}/* && mkdir -p ${CLIENT_BIN_DIR}darwin_arm64 - @cp -rf ${COMMAND_BIN_DIR}darwin_arm64/${PROJECT}-server ${CLIENT_BIN_DIR}darwin_arm64/${PROJECT} - - @cd client && npm install && npm run package-darwin-arm64 && cd .. - @rm -rf ${CLIENT_OUT_DIR}darwin_arm64 && mkdir -p ${CLIENT_OUT_DIR}darwin_arm64 && \ - mv ${CLIENT_OUT_DIR}${PROJECT}-darwin-arm64 ${CLIENT_OUT_DIR}darwin_arm64/gui && \ - mv ${CLIENT_OUT_DIR}darwin_arm64/gui/ztf.app ${CLIENT_OUT_DIR}darwin_arm64/ztf.app && rm -rf ${CLIENT_OUT_DIR}darwin_arm64/gui - # command line compile_command_win64: @echo 'start compile win64' @@ -198,12 +179,6 @@ compile_command_mac: ${BUILD_CMD} \ -o ${COMMAND_BIN_DIR}darwin/${PROJECT} ${COMMAND_MAIN_FILE} -compile_command_mac_arm64: - @echo 'start compile darwin' - @GOOS=darwin GOARCH=arm64 \ - ${BUILD_CMD} \ - -o ${COMMAND_BIN_DIR}darwin_arm64/${PROJECT} ${COMMAND_MAIN_FILE} - copy_files_win64: @echo 'start copy files win64' @cp -r demo "${CLIENT_OUT_DIR}win64" @@ -230,12 +205,6 @@ copy_files_mac: @cp -r demo "${COMMAND_BIN_DIR}darwin" @cp ${COMMAND_BIN_DIR}darwin/ztf "${CLIENT_OUT_DIR}darwin" -copy_files_mac_arm64: - @echo 'start copy files darwin arm64' - @cp -r demo "${CLIENT_OUT_DIR}darwin_arm64" - @cp -r demo "${COMMAND_BIN_DIR}darwin_arm64" - @cp ${COMMAND_BIN_DIR}darwin_arm64/ztf "${CLIENT_OUT_DIR}darwin_arm64" - # zip server zip_server_win64: @mkdir -p ${QINIU_DIST_DIR}win64