diff --git a/go/build.sh b/go/build.sh index 78fbeffe03e83375137ae4afc444d934517c46ca..518ab56283435f4675eb250870404d0ed2e8ca65 100644 --- a/go/build.sh +++ b/go/build.sh @@ -45,6 +45,9 @@ while [[ $# -gt 0 ]]; do ;; esac done +if [ -z "${VERSION}" ]; then + VERSION="v0.5.0" +fi # go module prepare export GO111MODULE=on @@ -56,6 +59,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 +100,9 @@ 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 ./* +DASHBOARD_TAR_NAME="yr-dashboard-${VERSION}.tar.gz" +tar -czvf "${DASHBOARD_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}/${DASHBOARD_TAR_NAME}" +cp "${DASHBOARD_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 edc89aec7f226b6b616c9d0df6830108ae459902..058d2f85f06b81a0e2e11b5407913017fe4544b0 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"