Merge pull request kosmos-io#51 from wuyingjun-lucky/main

Add release stage on makefile and fix build tag no names bug

Author: kosmos-robot

Makefile

@@ -89,16 +89,11 @@ update:
 verify:
 	hack/verify-all.sh
 
-.PHONY: release-chart
-release-chart:
-	hack/release-helm-chart.sh $(VERSION)
-
 .PHONY: test
 test:
 	mkdir -p ./_output/coverage/
 	go test --race --v ./pkg/... -coverprofile=./_output/coverage/coverage_pkg.txt -covermode=atomic
 	go test --race --v ./cmd/... -coverprofile=./_output/coverage/coverage_cmd.txt -covermode=atomic
-#   go test --race --v ./examples/... -coverprofile=./_output/coverage/coverage_examples.txt -covermode=atomic
 
 upload-images: images
 	@echo "push images to $(REGISTRY)"
@@ -112,27 +107,15 @@ endif
 	docker push ${REGISTRY}/clusterlink-network-manager:${VERSION}
 	docker push ${REGISTRY}/clusterlink-floater:${VERSION}
 
-# Build and package binary
-#
-# Example
-#   make release-kosmosctl
-RELEASE_TARGET=$(addprefix release-, $(CTL_TARGETS))
-.PHONY: $(RELEASE_TARGET)
-$(RELEASE_TARGET):
-	@set -e;\
-	target=$$(echo $(subst release-,,$@));\
-	make $$target;\
-	hack/release.sh $$target $(GOOS) $(GOARCH)
-
-# Build and package binary for all platforms
-#
-# Example
-#   make release
+.PHONY: release
 release:
-	@make release-linkctl GOOS=linux GOARCH=amd64
-	@make release-linkctl GOOS=linux GOARCH=arm64
-	@make release-linkctl GOOS=darwin GOARCH=amd64
-	@make release-linkctl GOOS=darwin GOARCH=arm64
+	@make release-kosmosctl GOOS=linux GOARCH=amd64
+	@make release-kosmosctl GOOS=linux GOARCH=arm64
+	@make release-kosmosctl GOOS=darwin GOARCH=amd64
+	@make release-kosmosctl GOOS=darwin GOARCH=arm64
+
+release-kosmosctl:
+	hack/release.sh kosmosctl ${GOOS} ${GOARCH}
 
 .PHONY: lint
 lint: golangci-lint

hack/build.sh

@@ -45,12 +45,12 @@ function build_binary_for_platform() {
   local -r os=${platform%/*}
   local -r arch=${platform##*/}
 
-  local gopkg="${CLUSTERLINK_GO_PACKAGE}/$(util::get_target_source $target)"
+  local target_pkg="${CLUSTERLINK_GO_PACKAGE}/$(util::get_target_source "$target")"
   set -x
   CGO_ENABLED=0 GOOS=${os} GOARCH=${arch} go build \
       -ldflags "${LDFLAGS:-}" \
       -o "_output/bin/${platform}/$target" \
-      "${gopkg}"
+      "${target_pkg}"
   set +x
 
   if [[ "${target}" == "clusterlink-floater" ]]; then

hack/docker.sh

@@ -109,4 +109,4 @@ function isCross() {
   fi
 }
 
-build_images $@ 
+build_images "$@"

hack/release.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
+source "${REPO_ROOT}/hack/util.sh"
+
+LDFLAGS="$(util::version_ldflags) ${LDFLAGS:-}"
+
+function release_binary() {
+  local -r target=$1
+  local -r os=$2
+  local -r arch=$3
+
+  release_binary_for_platform "${target}" "${os}" "${arch}"
+}
+
+function release_binary_for_platform() {
+  local -r target=$1
+  local -r os=$2
+  local -r arch=$3
+  local -r platform="${os}-${arch}"
+
+  local target_pkg="${CLUSTERLINK_GO_PACKAGE}/$(util::get_target_source "$target")"
+  set -x
+  CGO_ENABLED=0 GOOS=${os} GOARCH=${arch} go build \
+      -ldflags "${LDFLAGS:-}" \
+      -o "_output/release/$target-${platform}" \
+      "${target_pkg}"
+  set +x
+}
+
+release_binary "$@"

hack/util.sh

@@ -436,7 +436,7 @@ function util::add_routes() {
 }
 
 function util::get_version() {
-  git describe --tags --dirty
+  git describe --tags --dirty --always
 }
 
 function util::version_ldflags() {