From f2e345766334c95cf89ad3bc632f81eb95d5d001 Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong(cubxxw)" <3293172751nss@gmail.com> Date: Thu, 11 Jan 2024 18:48:37 +0800 Subject: [PATCH] feat: set openim lint Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com> --- docs/contrib/mac-developer-deployment-guide.md | 12 ++++++++++++ scripts/genconfig.sh | 2 +- scripts/lib/release.sh | 1 - scripts/release.sh | 4 ++-- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/docs/contrib/mac-developer-deployment-guide.md b/docs/contrib/mac-developer-deployment-guide.md index afadfed3f..40ef4b8be 100644 --- a/docs/contrib/mac-developer-deployment-guide.md +++ b/docs/contrib/mac-developer-deployment-guide.md @@ -52,6 +52,18 @@ Homebrew is an essential package manager for macOS. Install it using: ```sh git clone https://github.com//open-im-server.git + # The Docker bridging network mode for Mac is slightly different and needs to be set: + export DOCKER_BRIDGE_SUBNET=127.0.0.0/16 + # Set OpenIM IP + export OPENIM_IP= + # Init Config + make init + + # Start Components + docker compose up -d + + # Start OpenIM Server + make start ``` ### Setting Up the Devcontainer diff --git a/scripts/genconfig.sh b/scripts/genconfig.sh index 8ded38b22..659e8f4be 100755 --- a/scripts/genconfig.sh +++ b/scripts/genconfig.sh @@ -53,4 +53,4 @@ fi eval "cat << EOF $(cat ${template_file}) -EOF" +EOF" \ No newline at end of file diff --git a/scripts/lib/release.sh b/scripts/lib/release.sh index c1ab5aa97..1c2051e8f 100755 --- a/scripts/lib/release.sh +++ b/scripts/lib/release.sh @@ -572,7 +572,6 @@ function openim::release::verify_prereqs(){ fi fi - if [ -z "$(which ${TOOLS_DIR}/${COSTOOL} 2>/dev/null)" ]; then openim::log::info "${COSTOOL} tool not installed, try to install it." diff --git a/scripts/release.sh b/scripts/release.sh index 9e1f99bc4..9704c9936 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}