From 31e0f79dc35af548d0a6449e0bfb4df7bb871481 Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong(cubxxw-openim)" <3293172751nss@gmail.com> Date: Wed, 23 Aug 2023 14:27:11 +0800 Subject: [PATCH] feat: add test changelog file Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> --- .github/sync.yml | 8 ++++---- .github/workflows/golangci-lint.yml | 2 +- .github/workflows/greetings.yml | 4 ++-- .github/workflows/pull-request.yml | 2 +- docker-compose.yaml | 22 +++++++++------------- 5 files changed, 17 insertions(+), 21 deletions(-) diff --git a/.github/sync.yml b/.github/sync.yml index 6aa6dd566..7ffefc79a 100644 --- a/.github/sync.yml +++ b/.github/sync.yml @@ -75,15 +75,15 @@ OpenIMSDK/OpenKF: dest: .github/.codecov.yml replace: false -openim-sigs/openim-docker: +openim-docker/openim-docker: - source: ./config - dest: ./openim-server/config + dest: ./openim-server/main/config replace: true - source: ./docs - dest: ./openim-server/docs + dest: ./openim-server/main/docs replace: true - source: ./scripts - dest: ./openim-server/scripts + dest: ./openim-server/main/scripts replace: true group: diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index ba600f1f7..518909aed 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -45,7 +45,7 @@ jobs: args: --timeout=30m --config=/scripts/golangci.yml # --issues-exit-code=0 # Optional: show only new issues if it's a pull request. The default value is `false`. - # only-new-issues: true + only-new-issues: true # Optional:The mode to install golangci-lint. It can be 'binary' or 'goinstall'. install-mode: "goinstall" diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 47a58d2b6..667b6af08 100644 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -26,9 +26,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/first-interaction@main + - uses: actions/first-interaction@v1.1.1 with: - repo-token: ${{ secrets.BOT_GITHUB_TOKEN }} + repo-token: ${{ secrets.REDBOT_GITHUB_TOKEN }} issue-message: | Hello! Thank you for filing an issue. diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index ac8904450..8a3555e75 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -110,5 +110,5 @@ jobs: [workflow](https://github.com/OpenIMSDK/Open-IM-Server/blob/main/.github/workflows/pull-request.yml). base: main branch: cicd/patch-${{ github.event.number }} - labels: kind/documentation, area/test, ok-to-test + labels: kind/documentation token: ${{ secrets.REDBOT_GITHUB_TOKEN }} \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index 856a0bd8f..701d653b5 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -90,8 +90,8 @@ services: - 9090:9090 container_name: minio volumes: - - /mnt/data:/data - - /mnt/config:/root/.minio + - ${DATA_DIR}/components/mnt/data:/data + - ${DATA_DIR}/components/mnt/config:/root/.minio environment: MINIO_ROOT_USER: ${USER} MINIO_ROOT_PASSWORD: ${PASSWORD} @@ -99,15 +99,15 @@ services: command: minio server /data --console-address ':9090' openim-server: - # image: ghcr.io/openimsdk/openim-server:main - image: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server:main + image: ghcr.io/openimsdk/openim-server:main + # image: registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server:main # image: openim/openim-server:main container_name: openim-server - healthcheck: - test: ["CMD-SHELL", "./scripts/check-all.sh"] - interval: 30s - timeout: 10s - retries: 5 + # healthcheck: + # test: ["CMD-SHELL", "./scripts/check-all.sh"] + # interval: 30s + # timeout: 10s + # retries: 5 volumes: - ./logs:/openim/openim-server/logs - ./config:/openim/openim-server/config @@ -179,10 +179,6 @@ services: - prometheus network_mode: "host" -volumes: - openim-chat_logs: - openim-chat_config: - openim-chat_scripts: # node-exporter: # image: quay.io/prometheus/node-exporter