diff --git a/scripts/lib/golang.sh b/scripts/lib/golang.sh index a65d2c9f5..94ee9dff3 100755 --- a/scripts/lib/golang.sh +++ b/scripts/lib/golang.sh @@ -261,7 +261,18 @@ openim::golang::setup_platforms # The set of client targets that we are building for all platforms # If you update this list, please also update build/BUILD. readonly OPENIM_CLIENT_TARGETS=( - imctl + changelog + component + conversion-msg + conversion-mysql + formitychecker + imctl + infra + ncpu + openim-web + up35 + versionchecker + yamlfmt ) readonly OPENIM_CLIENT_BINARIES=("${OPENIM_CLIENT_TARGETS[@]##*/}") diff --git a/scripts/lib/release.sh b/scripts/lib/release.sh index 1c2051e8f..caaab1d0e 100755 --- a/scripts/lib/release.sh +++ b/scripts/lib/release.sh @@ -167,6 +167,9 @@ function openim::release::package_src_tarball() { function openim::release::package_server_tarballs() { # Find all of the built client binaries local long_platforms=("${LOCAL_OUTPUT_BINPATH}"/*/*) + echo "+++ LOCAL_OUTPUT_BINPATH: ${LOCAL_OUTPUT_BINPATH}" + echo "+++ long_platforms: ${long_platforms[@]}" + if [[ -n ${OPENIM_BUILD_PLATFORMS-} ]]; then read -ra long_platforms <<< "${OPENIM_BUILD_PLATFORMS}" fi @@ -188,26 +191,20 @@ function openim::release::package_server_tarballs() { rm -rf "${release_stage}" mkdir -p "${release_stage}/server/bin" - mkdir -p "${release_stage}/tools" local server_bins=("${OPENIM_SERVER_BINARIES[@]}") - local tools_bins=("tool1" "tool2") # Copy server binaries cp "${server_bins[@]/bin/#/${LOCAL_OUTPUT_BINPATH}/${platform}/}" \ "${release_stage}/server/bin/" - # Copy tools binaries - 新增:复制tools binaries - cp "${tools_bins[@]/bin/#/${LOCAL_OUTPUT_BINTOOLSPATH}/${platform}/}" \ - "${release_stage}/tools/" - openim::release::clean_cruft local package_name="${RELEASE_TARS}/openim-server-${platform_tag}.tar.gz" openim::release::create_tarball "${package_name}" "${release_stage}/.." ) & done - + echo "++++++++++++++++++++++++++package_server_tarballs++++++++++++++++++++++++++++" openim::log::status "Waiting on tarballs" openim::util::wait-for-jobs || { openim::log::error "server tarball creation failed"; exit 1; } } @@ -218,15 +215,17 @@ function openim::release::package_server_tarballs() { # a full SDK function openim::release::package_client_tarballs() { # Find all of the built client binaries - local long_platforms=("${LOCAL_OUTPUT_BINPATH}"/*/*) + local long_platforms=("${LOCAL_OUTPUT_BINTOOLSPATH}"/*/*) if [[ -n ${OPENIM_BUILD_PLATFORMS-} ]]; then read -ra long_platforms <<< "${OPENIM_BUILD_PLATFORMS}" fi + echo "++++ LOCAL_OUTPUT_BINTOOLSPATH: ${LOCAL_OUTPUT_BINTOOLSPATH}" + echo "++++ long_platforms: ${long_platforms[@]}" for platform_long in "${long_platforms[@]}"; do local platform local platform_tag - platform=${platform_long##${LOCAL_OUTPUT_BINPATH}/} # Strip LOCAL_OUTPUT_BINPATH + platform=${platform_long##${LOCAL_OUTPUT_BINTOOLSPATH}/} # Strip LOCAL_OUTPUT_BINTOOLSPATH platform_tag=${platform/\//-} # Replace a "/" for a "-" echo "++++ platform: ${platform}" @@ -240,33 +239,25 @@ function openim::release::package_client_tarballs() { echo "++++ release_stage: ${release_stage}" rm -rf "${release_stage}" mkdir -p "${release_stage}/client/bin" - mkdir -p "${release_stage}/tools" # Added: create directory for tools local client_bins=("${OPENIM_CLIENT_BINARIES[@]}") - local tools_bins=("tool1" "tool2") # Example tool names, replace with actual tools + echo "++++ client_bins: ${client_bins[@]}" + echo "++++ tools_bins: ${tools_bins[@]}" # Copy client binaries - echo "+++ cp source: ${client_bins[@]/bin/#/${LOCAL_OUTPUT_BINPATH}/${platform}/}" - echo "+++ cp target: ${release_stage}/client/bin/" + echo "++++ cp source: ${client_bins[@]/bin/#/${LOCAL_OUTPUT_BINTOOLSPATH}/${platform}/}" + echo "++++ cp target: ${release_stage}/client/bin/" - cp "${client_bins[@]/bin/#/${LOCAL_OUTPUT_BINPATH}/${platform}/}" \ + cp "${client_bins[@]/bin/#/${LOCAL_OUTPUT_BINTOOLSPATH}/${platform}/}" \ "${release_stage}/client/bin/" - - echo "+++ BIN cp source: ${tools_bins[@]/bin/#/${LOCAL_OUTPUT_BINTOOLSPATH}/${platform}/}" - echo "+++ TOOLS cp target: ${release_stage}/tools/" - - # Copy tools binaries - Added: copy tools binaries - cp "${tools_bins[@]/bin/#/${LOCAL_OUTPUT_BINTOOLSPATH}/${platform}/}" \ - "${release_stage}/tools/" - openim::release::clean_cruft local package_name="${RELEASE_TARS}/openim-client-${platform_tag}.tar.gz" openim::release::create_tarball "${package_name}" "${release_stage}/.." ) & done - + echo "++++++++++++++++++++++++++package_client_tarballs++++++++++++++++++++++++++++" openim::log::status "Waiting on tarballs" openim::util::wait-for-jobs || { openim::log::error "client tarball creation failed"; exit 1; } } diff --git a/scripts/lib/util.sh b/scripts/lib/util.sh index 133675494..91fbd7c87 100755 --- a/scripts/lib/util.sh +++ b/scripts/lib/util.sh @@ -306,8 +306,12 @@ openim::util::check_ports() { if [[ "$OSTYPE" == "linux-gnu"* ]]; then if command -v ss > /dev/null 2>&1; then info=$(ss -ltnp | grep ":$port" || true) + echo "!!!!!!!!!!! port=$port" + echo "!!!!!!!!!!! info=$info" else info=$(netstat -ltnp | grep ":$port" || true) + echo "!!!!!!!!!!! port=$port" + echo "!!!!!!!!!!! info=$info" fi elif [[ "$OSTYPE" == "darwin"* ]]; then # For macOS, use lsof diff --git a/scripts/release.sh b/scripts/release.sh index 9704c9936..df8663599 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -30,8 +30,8 @@ OPENIM_RELEASE_RUN_TESTS=${OPENIM_RELEASE_RUN_TESTS-y} openim::golang::setup_env openim::build::verify_prereqs openim::release::verify_prereqs -openim::build::build_image -# openim::build::build_command +# openim::build::build_image +openim::build::build_command openim::release::package_tarballs openim::release::updload_tarballs git push origin ${VERSION}