From db400d27be0edee9e7ba820a87dbec39a916c709 Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong(cubxxw-openim)" <3293172751nss@gmail.com> Date: Thu, 13 Jul 2023 21:53:28 +0800 Subject: [PATCH] fix: scripts and release Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> --- .github/workflows/scripts-test.yml | 1 - docker-compose.yaml | 2 +- scripts/msg_transfer_start.sh | 5 ----- scripts/start_all.sh | 5 +++++ 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/scripts-test.yml b/.github/workflows/scripts-test.yml index f2fdc8a19..78e31b1d2 100644 --- a/.github/workflows/scripts-test.yml +++ b/.github/workflows/scripts-test.yml @@ -59,7 +59,6 @@ jobs: ./scripts/check_all.sh cat logs/openIM.log shell: bash - continue-on-error: true - name: Print openIM.log run: | diff --git a/docker-compose.yaml b/docker-compose.yaml index 842b05ae5..69e1d03f4 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -100,7 +100,7 @@ services: openim_server: - image: ghcr.io/openimsdk/openim-server:v3.0.0-alpha.1 + image: ghcr.io/openimsdk/openim-server:v3.0.0-rc.1 container_name: openim-server volumes: - ./logs:/Open-IM-Server/logs diff --git a/scripts/msg_transfer_start.sh b/scripts/msg_transfer_start.sh index 2e03b4b1a..b1e17769d 100755 --- a/scripts/msg_transfer_start.sh +++ b/scripts/msg_transfer_start.sh @@ -22,11 +22,6 @@ source $SCRIPTS_ROOT/style_info.sh source $SCRIPTS_ROOT/path_info.sh source $SCRIPTS_ROOT/function.sh -cd $SCRIPTS_ROOT - -chmod +x build_all_service.sh -./build_all_service.sh - echo -e "${YELLOW_PREFIX}=======>SCRIPTS_ROOT=$SCRIPTS_ROOT${COLOR_SUFFIX}" echo -e "${YELLOW_PREFIX}=======>OPENIM_ROOT=$OPENIM_ROOT${COLOR_SUFFIX}" echo -e "${YELLOW_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}" diff --git a/scripts/start_all.sh b/scripts/start_all.sh index 244428539..b49997aa2 100755 --- a/scripts/start_all.sh +++ b/scripts/start_all.sh @@ -27,6 +27,11 @@ source $SCRIPTS_ROOT/function.sh cd $SCRIPTS_ROOT +if [ ! -d "${OPENIM_ROOT}/_output/bin/platforms" ]; then + # exec build_all_service.sh + "${SCRIPTS_ROOT}/build_all_service.sh" +fi + echo -e "${YELLOW_PREFIX}=======>SCRIPTS_ROOT=$SCRIPTS_ROOT${COLOR_SUFFIX}" echo -e "${YELLOW_PREFIX}=======>OPENIM_ROOT=$OPENIM_ROOT${COLOR_SUFFIX}" echo -e "${YELLOW_PREFIX}=======>pwd=$PWD${COLOR_SUFFIX}"