using symlink to binaries for current platform (openyurtio#202)

wawlian · Feb 8, 2021 · 0f4b1c9 · 0f4b1c9
1 parent cf437a1
commit 0f4b1c9
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 6 deletions.
diff --git a/hack/lib/build.sh b/hack/lib/build.sh
@@ -79,7 +79,7 @@ build_binaries() {
       targets=("${YURT_ALL_TARGETS[@]}")
     fi
 
-    local target_bin_dir=$(get_binary_dir_with_arch ${YURT_BIN_DIR})
+    local target_bin_dir=$(get_binary_dir_with_arch ${YURT_LOCAL_BIN_DIR})
     mkdir -p ${target_bin_dir}
     cd ${target_bin_dir}
     for binary in "${targets[@]}"; do
@@ -88,6 +88,11 @@ build_binaries() {
           -ldflags "${goldflags:-}" \
           -gcflags "${gcflags:-}" ${goflags} $YURT_ROOT/cmd/$(canonicalize_target $binary)
     done
+
+    if [[ $(host_platform) == ${HOST_PLATFORM} ]]; then
+      rm -f "${YURT_BIN_DIR}"
+      ln -s "${target_bin_dir}" "${YURT_BIN_DIR}"
+    fi
 }
 
 # gen_yamls generates yaml files for user specified components by 

diff --git a/hack/lib/common.sh b/hack/lib/common.sh
@@ -42,4 +42,9 @@ canonicalize_target() {
     fi
 
     echo $target
-}
+}
+
+# host_platform returns the host platform determined by golang
+host_platform() {
+  echo "$(go env GOHOSTOS)/$(go env GOHOSTARCH)"
+}
diff --git a/hack/lib/init.sh b/hack/lib/init.sh
@@ -22,6 +22,7 @@ YURT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
 YURT_MOD="$(head -1 $YURT_ROOT/go.mod | awk '{print $2}')"
 YURT_OUTPUT_DIR=${YURT_ROOT}/_output
 YURT_BIN_DIR=${YURT_OUTPUT_DIR}/bin
+YURT_LOCAL_BIN_DIR=${YURT_OUTPUT_DIR}/local/bin
 
 PROJECT_PREFIX=${PROJECT_PREFIX:-yurt}
 LABEL_PREFIX=${LABEL_PREFIX:-openyurt.io}

diff --git a/hack/lib/release-images.sh b/hack/lib/release-images.sh
@@ -58,6 +58,7 @@ function build_multi_arch_binaries() {
         "--env GIT_VERSION=${GIT_VERSION}"
         "--env GIT_COMMIT=${GIT_COMMIT}"
         "--env BUILD_DATE=${BUILD_DATE}"
+        "--env HOST_PLATFORM=$(host_platform)"
     )
     # use goproxy if build from inside mainland China
     [[ $region == "cn" ]] && docker_run_opts+=("--env GOPROXY=https://goproxy.cn")
@@ -71,7 +72,7 @@ function build_multi_arch_binaries() {
     local sub_commands="sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories; \
         apk --no-cache add bash git; \
         cd /opt/src; umask 0022; \
-        rm -rf ${YURT_BIN_DIR}/* ;"
+        rm -rf ${YURT_LOCAL_BIN_DIR}/* ;"
     for arch in ${target_arch[@]}; do
         sub_commands+="GOARCH=$arch bash ./hack/make-rules/build.sh $(echo ${bin_targets_without_servant[@]}); "
     done
@@ -84,7 +85,7 @@ function build_docker_image() {
     for arch in ${target_arch[@]}; do
         for binary in "${bin_targets_without_servant[@]}"; do
            local binary_name=$(get_output_name $binary)
-           local binary_path=${YURT_BIN_DIR}/${SUPPORTED_OS}/${arch}/${binary_name}
+           local binary_path=${YURT_LOCAL_BIN_DIR}/${SUPPORTED_OS}/${arch}/${binary_name}
            if [ -f ${binary_path} ]; then
                local docker_build_path=${DOCKER_BUILD_BASE_IDR}/${SUPPORTED_OS}/${arch}
                local docker_file_path=${docker_build_path}/Dockerfile.${binary_name}-${arch}
@@ -146,7 +147,7 @@ build_images() {
     # Always clean first
     rm -Rf ${YURT_OUTPUT_DIR}
     rm -Rf ${DOCKER_BUILD_BASE_IDR}
-    mkdir -p ${YURT_BIN_DIR}
+    mkdir -p ${YURT_LOCAL_BIN_DIR}
     mkdir -p ${YURT_IMAGE_DIR}
     mkdir -p ${DOCKER_BUILD_BASE_IDR}
 

diff --git a/hack/make-rules/build-e2e.sh b/hack/make-rules/build-e2e.sh
@@ -12,7 +12,7 @@ function build_e2e() {
     goflags=${GOFLAGS:-}
 
 
-    local target_bin_dir=$(get_binary_dir_with_arch ${YURT_BIN_DIR})
+    local target_bin_dir=$(get_binary_dir_with_arch ${YURT_LOCAL_BIN_DIR})
     mkdir -p ${target_bin_dir}
     cd ${target_bin_dir}
     echo "Building ${YURT_E2E_TARGETS}"

diff --git a/hack/make-rules/build.sh b/hack/make-rules/build.sh
@@ -19,4 +19,6 @@ set -x
 YURT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
 source "${YURT_ROOT}/hack/lib/init.sh" 
 
+HOST_PLATFORM=${HOST_PLATFORM:-"$(host_platform)"}
+
 build_binaries "$@"