From cce47bddd724b13263ab82ea8c69564f955c6bca Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong(cubxxw-openim)" <3293172751nss@gmail.com> Date: Mon, 31 Jul 2023 22:15:22 +0800 Subject: [PATCH] fix: part of the make rules optimization Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> --- .github/workflows/image.yml | 1 + .github/workflows/project-progress.yml | 2 +- scripts/enterprise/path_info.cfg | 3 +-- scripts/make-rules/golang.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml index 2ecfad6ea..5b9142cd8 100644 --- a/.github/workflows/image.yml +++ b/.github/workflows/image.yml @@ -18,6 +18,7 @@ on: push: branches: - main + - release-v* paths: - "**.go" - "!**_test.go" diff --git a/.github/workflows/project-progress.yml b/.github/workflows/project-progress.yml index 247404aa0..d0cc10604 100644 --- a/.github/workflows/project-progress.yml +++ b/.github/workflows/project-progress.yml @@ -33,4 +33,4 @@ jobs: with: project: OpenIM-V3.1 column: In Progress - repo-token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + repo-token: ${{ secrets.BOT_GITHUB_TOKEN }} \ No newline at end of file diff --git a/scripts/enterprise/path_info.cfg b/scripts/enterprise/path_info.cfg index 6ce712593..7e2c092b2 100644 --- a/scripts/enterprise/path_info.cfg +++ b/scripts/enterprise/path_info.cfg @@ -4,8 +4,6 @@ demo_server_name="openim_chat_api" demo_server_binary_root="$BIN_DIR/" - - #Global configuration file default dir config_path="../.docker-compose_cfg/config.yaml" @@ -18,6 +16,7 @@ service_source_root=( ../cmd/openim-rpc/admin/ ../cmd/openim-rpc/chat/ ) + #service filename service_names=( #api service filename diff --git a/scripts/make-rules/golang.mk b/scripts/make-rules/golang.mk index dedcdc9fc..c80469d75 100644 --- a/scripts/make-rules/golang.mk +++ b/scripts/make-rules/golang.mk @@ -26,7 +26,7 @@ GO_LDFLAGS += -X $(VERSION_PACKAGE).gitVersion=$(GIT_TAG) \ -s -w # -s -w deletes debugging information and symbol tables ifeq ($(DEBUG), 1) GO_BUILD_FLAGS += -gcflags "all=-N -l" - GO_LDFLAGS= + GO_LDFLAGS = endif GO_BUILD_FLAGS += -ldflags "$(GO_LDFLAGS)"