diff --git a/tools/codescan/config.yaml b/.github/code-language-detector.yml
similarity index 100%
rename from tools/codescan/config.yaml
rename to .github/code-language-detector.yml
diff --git a/.github/workflows/bot-auto-cherry-pick.yml b/.github/workflows/bot-auto-cherry-pick.yml
index baafecad7..cdd7241e2 100644
--- a/.github/workflows/bot-auto-cherry-pick.yml
+++ b/.github/workflows/bot-auto-cherry-pick.yml
@@ -25,6 +25,7 @@ jobs:
- name: Comment cherry-pick command
uses: actions/github-script@v7
with:
+ github-token: ${{ secrets.BOT_GITHUB_TOKEN }}
script: |
const pr = context.payload.pull_request;
if (!pr.merged) {
@@ -63,5 +64,4 @@ jobs:
repo: context.repo.repo,
issue_number: pr.number,
body: cherryPickCmd
- });
- github-token: ${{ secrets.BOT_GITHUB_TOKEN }}
\ No newline at end of file
+ });
\ No newline at end of file
diff --git a/.github/workflows/bot-cherry-pick.yml b/.github/workflows/bot-cherry-pick.yml
index e488e97de..71597189c 100644
--- a/.github/workflows/bot-cherry-pick.yml
+++ b/.github/workflows/bot-cherry-pick.yml
@@ -12,23 +12,57 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-name: Github Rebot for Cherry Pick On Comment
+name: Github Robot for Cherry Pick On Comment
+
on:
issue_comment:
types: [created]
+
jobs:
cherry-pick:
name: Cherry Pick
- # && github.event.comment.user.login=='kubbot'
if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/cherry-pick')
runs-on: ubuntu-latest
+
steps:
- name: Checkout the latest code
uses: actions/checkout@v4
with:
token: ${{ secrets.BOT_GITHUB_TOKEN }}
- fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
+ fetch-depth: 0 # To ensure all history is available for cherry-picking
+
- name: Automatic Cherry Pick
uses: vendoo/gha-cherry-pick@v1
+ with:
+ # Assuming the cherry-pick commit SHA is passed in the comment like '/cherry-pick sha'
+ commit-sha: ${{ github.event.comment.body }}
+ env:
+ GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
+
+ - name: Create a new branch for PR
+ run: |
+ PR_BRANCH="cherry-pick-${GITHUB_SHA}-to-${{ github.base_ref }}"
+ git checkout -b $PR_BRANCH
+ git push origin $PR_BRANCH
+ env:
+ GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
+
+ - name: Create Pull Request
+ uses: actions/github-script@v5
+ with:
+ script: |
+ const prTitle = "Cherry-pick to ${{ github.base_ref }}"
+ const prBody = "Automated cherry-pick of ${{ github.event.comment.body }}\n\n/cc @kubbot"
+ const base = "${{ github.base_ref }}"
+ const head = "cherry-pick-${{ github.sha }}-to-${{ github.base_ref }}"
+ const createPr = await github.rest.pulls.create({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ title: prTitle,
+ body: prBody,
+ head: head,
+ base: base,
+ maintainer_can_modify: true, // Allows maintainers to edit the PR
+ })
env:
- GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
\ No newline at end of file
+ GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
diff --git a/.github/workflows/code-language-detector.yml b/.github/workflows/code-language-detector.yml
new file mode 100644
index 000000000..80ec94733
--- /dev/null
+++ b/.github/workflows/code-language-detector.yml
@@ -0,0 +1,27 @@
+# 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.
+
+name: Language Check Workflow Test
+
+on: [pull_request]
+
+jobs:
+ comment-language-detector:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout Repository
+ uses: actions/checkout@v4
+
+ - name: Code Language Detector
+ uses: kubecub/comment-lang-detector@v1.0.0
\ No newline at end of file
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
index b5f901d25..f98221e41 100644
--- a/.github/workflows/e2e-test.yml
+++ b/.github/workflows/e2e-test.yml
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-name: OpenIM Linux System E2E Test
+name: OpenIM E2E And API Test
on:
workflow_dispatch:
@@ -82,7 +82,7 @@ jobs:
sudo make tidy
sudo make tools.verify.go-gitlint
- - name: Build, Start
+ - name: Build, Start(make build && make start)
run: |
sudo ./scripts/install/install.sh -i
@@ -90,9 +90,8 @@ jobs:
run: |
sudo ./scripts/install/install.sh -s
- - name: Exec OpenIM API test
+ - name: Exec OpenIM API test (make test-api)
run: |
- sudo make test-api
mkdir -p ./tmp
touch ./tmp/test.md
echo "# OpenIM Test" >> ./tmp/test.md
@@ -103,9 +102,10 @@ jobs:
echo "" >> ./tmp/test.md
echo "" >> ./tmp/test.md
- - name: Exec OpenIM E2E Test
+ sudo make test-api
+
+ - name: Exec OpenIM E2E Test (make test-e2e)
run: |
- sudo make test-e2e
echo "" >> ./tmp/test.md
echo "## OpenIM E2E Test" >> ./tmp/test.md
echo "Command Output for OpenIM E2E Test
" >> ./tmp/test.md
@@ -114,6 +114,8 @@ jobs:
echo "" >> ./tmp/test.md
echo "