Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
FGadvancer committed Dec 12, 2023
2 parents 3a24602 + 6b55cfd commit dcda77c
Show file tree
Hide file tree
Showing 212 changed files with 7,066 additions and 5,952 deletions.
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ CHANGELOG/

# Ignore deployment-related files
docker-compose.yaml
deployments/

# Ignore assets
assets/
Expand Down
308 changes: 0 additions & 308 deletions .env

This file was deleted.

20 changes: 17 additions & 3 deletions .github/workflows/e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ on:
# run e2e test every 4 hours
- cron: 0 */4 * * *

env:
CALLBACK_ENABLE: true

jobs:
build:
name: Test
Expand Down Expand Up @@ -70,9 +73,9 @@ jobs:

- name: Docker Operations
run: |
curl -o docker-compose.yml https://raw.githubusercontent.com/OpenIMSDK/openim-docker/main/example/basic-openim-server-dependency.yml
sudo make init
sudo docker compose up -d
sudo sleep 60
sudo sleep 20
- name: Module Operations
run: |
Expand All @@ -97,4 +100,15 @@ jobs:
- name: Exec OpenIM System uninstall
run: |
sudo ./scripts/install/install.sh -u
sudo ./scripts/install/install.sh -u
- name: gobenchdata publish
uses: bobheadxi/gobenchdata@v1
with:
PRUNE_COUNT: 30
GO_TEST_FLAGS: -cpu 1,2
PUBLISH: true
PUBLISH_BRANCH: gh-pages
env:
GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
continue-on-error: true
2 changes: 1 addition & 1 deletion .github/workflows/link-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
# ./*.md all markdown files in the root directory
args: --verbose -E -i --no-progress --exclude-path './CHANGELOG' './**/*.md'
env:
GITHUB_TOKEN: ${{secrets.GH_PAT}}
GITHUB_TOKEN: ${{secrets.BOT_GITHUB_TOKEN}}

- name: Create Issue From File
if: env.lychee_exit_code != 0
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/opencommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,5 @@ jobs:
OCO_EMOJI: false
OCO_MODEL: gpt-3.5-turbo-16k
OCO_LANGUAGE: en
OCO_PROMPT_MODULE: conventional-commit
OCO_PROMPT_MODULE: conventional-commit
continue-on-error: true
5 changes: 3 additions & 2 deletions .github/workflows/openimci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,9 @@ jobs:

- name: Docker Operations
run: |
curl -o docker-compose.yml https://raw.githubusercontent.com/OpenIMSDK/openim-docker/main/example/basic-openim-server-dependency.yml
sudo make init
sudo docker compose up -d
sudo sleep 60
sudo sleep 20
- name: Module Operations
run: |
Expand Down Expand Up @@ -195,4 +195,5 @@ jobs:

- name: Test Docker Build
run: |
sudo make init
sudo make image
Loading

0 comments on commit dcda77c

Please sign in to comment.