From 9527278239959019306fa7b15e269665204178ee Mon Sep 17 00:00:00 2001 From: Xinwei Xiong <3293172751NSS@gmail.com> Date: Fri, 26 Jan 2024 12:05:17 +0800 Subject: [PATCH] feat: fix openim logs and ci (#1817) --- .github/workflows/pull-request.yml | 3 --- .github/workflows/sync-release.yml | 3 ++- .github/workflows/sync.yml | 5 +++-- scripts/lib/logging.sh | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index a03eade82e..828d30d7d2 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -78,9 +78,6 @@ jobs: echo "Run unit test and get test coverage successfully" continue-on-error: true - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 - - name: OpenIM verify copyright run: | sudo make verify-copyright diff --git a/.github/workflows/sync-release.yml b/.github/workflows/sync-release.yml index 2a29f6218d..e156e07d80 100644 --- a/.github/workflows/sync-release.yml +++ b/.github/workflows/sync-release.yml @@ -3,7 +3,7 @@ # you may not use this file except in compliance with the License. # https://github.com/BetaHuhn/repo-file-sync-action -name: Synchronize kubecub public code to other repositories +name: Synchronize OpenIM Release Branch Public Code To Other Repositories on: push: paths: @@ -41,3 +41,4 @@ jobs: automerge ASSIGNEES: | kubbot + continue-on-error: true \ No newline at end of file diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index 6e5c797998..77ed2f881b 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -3,7 +3,7 @@ # you may not use this file except in compliance with the License. # https://github.com/BetaHuhn/repo-file-sync-action -name: Synchronize kubecub public code to other repositories +name: Synchronize OpenIM Main Branch Public Code To Other Repositories on: push: branches: @@ -36,4 +36,5 @@ jobs: file-sync automerge ASSIGNEES: | - kubbot \ No newline at end of file + kubbot + continue-on-error: true \ No newline at end of file diff --git a/scripts/lib/logging.sh b/scripts/lib/logging.sh index eb83c526d4..c520850e8f 100755 --- a/scripts/lib/logging.sh +++ b/scripts/lib/logging.sh @@ -129,7 +129,7 @@ openim::log::error_exit() { # Log an error but keep going. Don't dump the stack or exit. openim::log::error() { - timestamp=$(date +"[%m%d %H:%M:%S]") + timestamp=$(date +"[%Y-%m-%d %H:%M:%S %Z]") echo_log "!!! ${timestamp} ${1-}" >&2 shift for message; do @@ -192,7 +192,7 @@ openim::log::status() { return fi - timestamp=$(date +"[%m%d %H:%M:%S]") + timestamp=$(date +"[%Y-%m-%d %H:%M:%S %Z]") echo_log "+++ ${timestamp} ${1}" shift for message; do