From d3dd4b26a84e2d4958765792caf91eb8dc7d5a17 Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong (cubxxw)" <3293172751nss@gmail.com> Date: Sun, 7 Jan 2024 12:03:58 +0800 Subject: [PATCH] feat: add openim mongo logic Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com> --- .github/workflows/e2e-test.yml | 20 +++++++++++++++++--- deployments/templates/env-template.yaml | 14 ++++++++++++++ scripts/install-im-server.sh | 14 ++++++++++++++ scripts/make-rules/common.mk | 2 +- 4 files changed, 46 insertions(+), 4 deletions(-) diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index 2f6d7fe05..d7831b638 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -92,16 +92,30 @@ jobs: - name: Exec OpenIM API test run: | - sudo make test-api - + sudo make test-api | tee /tmp/test-api.md + - name: Exec OpenIM E2E test run: | - sudo make test-e2e + sudo make test-e2e | tee /tmp/test-api.md - name: Exec OpenIM System uninstall run: | sudo ./scripts/install/install.sh -u + - name: Comment PR with file + uses: thollander/actions-comment-pull-request@v2 + with: + filePath: /tmp/test-api.md + comment_tag: nrt_file + reactions: eyes, rocket + mode: recreate + + - name: Check outputs + run: | + echo "id : ${{ steps.nrt_message.outputs.id }}" + echo "body : ${{ steps.nrt_message.outputs.body }}" + echo "html_url : ${{ steps.nrt_message.outputs.html_url }}" + - name: gobenchdata publish uses: bobheadxi/gobenchdata@v1 with: diff --git a/deployments/templates/env-template.yaml b/deployments/templates/env-template.yaml index 2bc8dee08..e7166ff2d 100644 --- a/deployments/templates/env-template.yaml +++ b/deployments/templates/env-template.yaml @@ -1,3 +1,17 @@ +# Copyright © 2024 OpenIM. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + # ----------------------------------------------------------------------------- # General Configuration # This section contains general configuration options for the entire environment. diff --git a/scripts/install-im-server.sh b/scripts/install-im-server.sh index 16ac625ee..9afbb97c9 100755 --- a/scripts/install-im-server.sh +++ b/scripts/install-im-server.sh @@ -1,4 +1,18 @@ #!/usr/bin/env bash +# Copyright © 2024 OpenIM. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + # # OpenIM Docker Deployment Script # diff --git a/scripts/make-rules/common.mk b/scripts/make-rules/common.mk index 81b44826b..c56f9f071 100644 --- a/scripts/make-rules/common.mk +++ b/scripts/make-rules/common.mk @@ -129,7 +129,7 @@ FIND := find . ! -path './utils/*' ! -path './vendor/*' ! -path './third_party/* XARGS := xargs -r --no-run-if-empty # Linux command settings-CODE DIRS Copyright -CODE_DIRS := $(ROOT_DIR)/pkg $(ROOT_DIR)/cmd $(ROOT_DIR)/config $(ROOT_DIR)/.docker-compose_cfg $(ROOT_DIR)/internal $(ROOT_DIR)/scripts $(ROOT_DIR)/test $(ROOT_DIR)/.github $(ROOT_DIR)/build $(ROOT_DIR)/tools $(ROOT_DIR)/deployments +CODE_DIRS := $(ROOT_DIR)/pkg $(ROOT_DIR)/cmd $(ROOT_DIR)/config $(ROOT_DIR)/internal $(ROOT_DIR)/scripts $(ROOT_DIR)/test $(ROOT_DIR)/.github $(ROOT_DIR)/build $(ROOT_DIR)/tools $(ROOT_DIR)/deployments FINDS := find $(CODE_DIRS) # Makefile settings: Select different behaviors by determining whether V option is set