From f16f4810ad80b141db2394bdc4b8666327c86b45 Mon Sep 17 00:00:00 2001 From: wxq Date: Tue, 25 Nov 2025 09:47:49 +0800 Subject: [PATCH 1/4] menjin bugfix --- go/build.sh | 11 ++++++++--- tools/download_dependency.sh | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/go/build.sh b/go/build.sh index 78fbeffe..5ebeb924 100644 --- a/go/build.sh +++ b/go/build.sh @@ -56,6 +56,7 @@ go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest go env -w "GOFLAGS"="-mod=mod" echo "generating fs proto pb objects" +mkdir -p "${OUTPUT_DIR}" protoc --proto_path=${POSIX_DIR} --go_out=${OUTPUT_DIR} --go-grpc_out=${OUTPUT_DIR} ${POSIX_DIR}/*.proto cp -ar ${OUTPUT_DIR}/yuanrong.org/kernel/pkg/ ${PROJECT_DIR} rm -rf "${OUTPUT_DIR}/yuanrong.org" @@ -96,8 +97,12 @@ CC='gcc -fstack-protector-strong -D_FORTIFY_SOURCE=2 -O2' go build -tags="${BUIL "${OUTPUT_DIR}"/bin/collector "${PROJECT_DIR}"/cmd/collector/main.go cd "${OUTPUT_DIR}" -tar -czvf yr-dashboard-v0.0.1.tar.gz ./* +TAR_NAME="yr-dashboard-${VERSION}.tar.gz" +if [ -z "${VERSION}" ]; then + TAR_NAME="yr-dashboard.tar.gz" +fi +tar -czvf "${TAR_NAME}" ./* mkdir -p "${RUNTIME_OUTPUT_DIR}" -rm -rf "${RUNTIME_OUTPUT_DIR}/yr-dashboard-v0.0.1.tar.gz" -cp yr-dashboard-v0.0.1.tar.gz "${RUNTIME_OUTPUT_DIR}" +rm -rf "${RUNTIME_OUTPUT_DIR}/${TAR_NAME}" +cp "${TAR_NAME}" "${RUNTIME_OUTPUT_DIR}" cd "${PROJECT_DIR}" \ No newline at end of file diff --git a/tools/download_dependency.sh b/tools/download_dependency.sh index edc89aec..058d2f85 100644 --- a/tools/download_dependency.sh +++ b/tools/download_dependency.sh @@ -35,7 +35,7 @@ RUNTIME_SRC_DIR="${BASE_DIR}/../" YR_DATASYSTEM_BIN_DIR="${RUNTIME_SRC_DIR}/datasystem" YR_FUNCTIONSYSTEM_BIN_DIR="${RUNTIME_SRC_DIR}/functionsystem" YR_FRONTEND_SRC_DIR="${RUNTIME_SRC_DIR}/../frontend" -YR_DASHBOARD_SRC_DIR="${RUNTIME_SRC_DIR}/yuanrong" +YR_DASHBOARD_SRC_DIR="${RUNTIME_SRC_DIR}/go" YR_METRICS_BIN_DIR="${RUNTIME_SRC_DIR}/metrics" THIRD_PARTY_DIR="${RUNTIME_SRC_DIR}/../thirdparty/" RUNTIME_OUTPUT_DIR="${RUNTIME_SRC_DIR}/output" -- Gitee From 72ce17b9b22895fceeb6490cb82f58de586ec110 Mon Sep 17 00:00:00 2001 From: wxq Date: Tue, 25 Nov 2025 09:55:41 +0800 Subject: [PATCH 2/4] bugfix --- go/build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/go/build.sh b/go/build.sh index 5ebeb924..793049a5 100644 --- a/go/build.sh +++ b/go/build.sh @@ -97,12 +97,12 @@ CC='gcc -fstack-protector-strong -D_FORTIFY_SOURCE=2 -O2' go build -tags="${BUIL "${OUTPUT_DIR}"/bin/collector "${PROJECT_DIR}"/cmd/collector/main.go cd "${OUTPUT_DIR}" -TAR_NAME="yr-dashboard-${VERSION}.tar.gz" +DASHBOARD_TAR_NAME="yr-dashboard-${VERSION}.tar.gz" if [ -z "${VERSION}" ]; then - TAR_NAME="yr-dashboard.tar.gz" + DASHBOARD_TAR_NAME="yr-dashboard.tar.gz" fi -tar -czvf "${TAR_NAME}" ./* +tar -czvf "${DASHBOARD_TAR_NAME}" ./* mkdir -p "${RUNTIME_OUTPUT_DIR}" -rm -rf "${RUNTIME_OUTPUT_DIR}/${TAR_NAME}" -cp "${TAR_NAME}" "${RUNTIME_OUTPUT_DIR}" +rm -rf "${RUNTIME_OUTPUT_DIR}/${DASHBOARD_TAR_NAME}" +cp "${DASHBOARD_TAR_NAME}" "${RUNTIME_OUTPUT_DIR}" cd "${PROJECT_DIR}" \ No newline at end of file -- Gitee From d09cae77cad0994bf463c5bd90ad9316732a8a3f Mon Sep 17 00:00:00 2001 From: wxq Date: Tue, 25 Nov 2025 10:00:00 +0800 Subject: [PATCH 3/4] default version --- go/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/go/build.sh b/go/build.sh index 793049a5..ef3096f1 100644 --- a/go/build.sh +++ b/go/build.sh @@ -45,6 +45,9 @@ while [[ $# -gt 0 ]]; do ;; esac done +if [ -z "${VERSION}" ]; then + VERSION="v1.0.0" +fi # go module prepare export GO111MODULE=on @@ -98,9 +101,6 @@ CC='gcc -fstack-protector-strong -D_FORTIFY_SOURCE=2 -O2' go build -tags="${BUIL cd "${OUTPUT_DIR}" DASHBOARD_TAR_NAME="yr-dashboard-${VERSION}.tar.gz" -if [ -z "${VERSION}" ]; then - DASHBOARD_TAR_NAME="yr-dashboard.tar.gz" -fi tar -czvf "${DASHBOARD_TAR_NAME}" ./* mkdir -p "${RUNTIME_OUTPUT_DIR}" rm -rf "${RUNTIME_OUTPUT_DIR}/${DASHBOARD_TAR_NAME}" -- Gitee From e48dc100f2796bf3a42541252c0b1d1b5378cc47 Mon Sep 17 00:00:00 2001 From: wxq Date: Tue, 25 Nov 2025 10:02:48 +0800 Subject: [PATCH 4/4] default version --- go/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/build.sh b/go/build.sh index ef3096f1..518ab562 100644 --- a/go/build.sh +++ b/go/build.sh @@ -46,7 +46,7 @@ while [[ $# -gt 0 ]]; do esac done if [ -z "${VERSION}" ]; then - VERSION="v1.0.0" + VERSION="v0.5.0" fi # go module prepare -- Gitee