From 64194cb25583b21a0e8de45ad2fb2c0ad5725fbc Mon Sep 17 00:00:00 2001 From: infinitycat Date: Fri, 4 Apr 2025 19:57:52 +0800 Subject: [PATCH 1/9] =?UTF-8?q?build(docker):=20=E6=9B=B4=E6=96=B0=20Docke?= =?UTF-8?q?r=E9=95=9C=E5=83=8F=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 maimbot 镜像版本从 refactor 改为 latest --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8062b358d..1e469cf5a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,8 +19,8 @@ services: - maim_bot core: container_name: maim-bot-core - image: sengokucola/maimbot:refactor - # image: infinitycat/maimbot:refactor + image: sengokucola/maimbot:latest + # image: infinitycat/maimbot:latest environment: - TZ=Asia/Shanghai # - EULA_AGREE=35362b6ea30f12891d46ef545122e84a # 同意EULA From aed69bf99c642ca92dcc76d73f5e0901fadcd332 Mon Sep 17 00:00:00 2001 From: SengokuCola <1026294844@qq.com> Date: Fri, 4 Apr 2025 21:40:28 +0800 Subject: [PATCH 2/9] Update README.md --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c2fd750dc..fa97fec14 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # 麦麦！MaiCore-MaiMBot (编辑中) +## 新版0.6.0部署前先阅读：https://docs.mai-mai.org/manual/usage/mmc_q_a +
![Python Version](https://img.shields.io/badge/Python-3.9+-blue) @@ -65,7 +67,8 @@ - [📚 核心Wiki文档](https://docs.mai-mai.org) - 项目最全面的文档中心，你可以了解麦麦有关的一切 ### 最新版本部署教程(MaiCore版本) -- [🚀 最新版本部署教程](https://docs.mai-mai.org/manual/deployment/refactor_deploy.html) - 基于MaiCore的新版本部署方式（与旧版本不兼容） +- [🚀 最新版本部署教程](https://docs.mai-mai.org/manual/deployment/mmc_deploy.html) - 基于MaiCore的新版本部署方式（与旧版本不兼容） + ## 🎯 功能介绍 From c914d4fc0ece2192c87d30e5f54f07e35cc5dc30 Mon Sep 17 00:00:00 2001 From: Cookie987 Date: Fri, 4 Apr 2025 22:01:38 +0800 Subject: [PATCH 3/9] =?UTF-8?q?fix:=20Linux=E5=AE=89=E8=A3=85=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E9=80=82=E9=85=8D=E6=9C=80=E6=96=B0=E5=88=86=E6=94=AF?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/run.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/scripts/run.sh b/scripts/run.sh index 1f7fba1ce..8babf0888 100644 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -369,7 +369,18 @@ run_installation() { # 选择分支 choose_branch() { - BRANCH=refactor + BRANCH=$(whiptail --title "🔀 选择分支" --radiolist "请选择要安装的分支：" 15 60 4 \ + "main" "稳定最新版（推荐）" ON \ + "classical" "经典版" OFF \ + "custom" "自定义分支" OFF 3>&1 1>&2 2>&3) + + if [[ "$BRANCH" == "custom" ]]; then + BRANCH=$(whiptail --title "🔀 自定义分支" --inputbox "请输入自定义分支名称：" 10 60 "refactor" 3>&1 1>&2 2>&3) + [[ -z "$BRANCH" ]] && { + whiptail --msgbox "🚫 分支名称不能为空！" 10 60 + exit 1 + } + fi } choose_branch From fb427d94e28b9c78cd1d47edf4423125bef56784 Mon Sep 17 00:00:00 2001 From: Cookie987 Date: Fri, 4 Apr 2025 22:04:39 +0800 Subject: [PATCH 4/9] Update scripts/run.sh Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com> --- scripts/run.sh | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/scripts/run.sh b/scripts/run.sh index 8babf0888..c1fe4973f 100644 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -369,18 +369,28 @@ run_installation() { # 选择分支 choose_branch() { - BRANCH=$(whiptail --title "🔀 选择分支" --radiolist "请选择要安装的分支：" 15 60 4 \ - "main" "稳定最新版（推荐）" ON \ - "classical" "经典版" OFF \ - "custom" "自定义分支" OFF 3>&1 1>&2 2>&3) + BRANCH=$(whiptail --title "🔀 选择分支" --radiolist "请选择要安装的分支：" 15 60 4 \ + "main" "稳定最新版（推荐）" ON \ + "classical" "经典版" OFF \ + "custom" "自定义分支" OFF 3>&1 1>&2 2>&3) + RETVAL=$? + if [ $RETVAL -ne 0 ]; then + whiptail --msgbox "操作取消！" 10 60 + exit 1 + fi - if [[ "$BRANCH" == "custom" ]]; then - BRANCH=$(whiptail --title "🔀 自定义分支" --inputbox "请输入自定义分支名称：" 10 60 "refactor" 3>&1 1>&2 2>&3) - [[ -z "$BRANCH" ]] && { + if [[ "$BRANCH" == "custom" ]]; then + BRANCH=$(whiptail --title "🔀 自定义分支" --inputbox "请输入自定义分支名称：" 10 60 "refactor" 3>&1 1>&2 2>&3) + RETVAL=$? + if [ $RETVAL -ne 0 ]; then + whiptail --msgbox "输入取消！" 10 60 + exit 1 + fi + if [[ -z "$BRANCH" ]]; then whiptail --msgbox "🚫 分支名称不能为空！" 10 60 exit 1 - } fi + fi } choose_branch From 485918185c12ac6b495e2d6ad9b1f05ba170c80b Mon Sep 17 00:00:00 2001 From: SengokuCola <1026294844@qq.com> Date: Fri, 4 Apr 2025 23:22:19 +0800 Subject: [PATCH 5/9] Update pull_request_template.md --- .github/pull_request_template.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 19a587960..56ecb64e0 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,8 +1,7 @@ -- 🔴**当前项目处于重构阶段（2025.3.14-）** -- ✅ 接受：与main直接相关的Bug修复：提交到main-fix分支 -- ⚠️ 冻结：所有新功能开发和非紧急重构 - +- ✅ 接受：与main直接相关的Bug修复：提交到dev分支 +- 新增功能类pr需要经过issue提前讨论，否则不会被合并 + # 请填写以下内容 （删除掉中括号内的空格，并替换为**小写的x**） 1. - [ ] `main` 分支 **禁止修改**，请确认本次提交的分支 **不是 `main` 分支** From 712ad379494738e6b9bdc5b0e7de9d3415a365f3 Mon Sep 17 00:00:00 2001 From: infinitycat Date: Fri, 4 Apr 2025 23:50:13 +0800 Subject: [PATCH 6/9] =?UTF-8?q?ci(docker):=20=E6=B7=BB=E5=8A=A0=20Docker?= =?UTF-8?q?=20Hub=E6=8F=8F=E8=BF=B0=E6=9B=B4=E6=96=B0=E6=AD=A5=E9=AA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在 GitHub Actions工作流中添加了 Docker Hub 描述更新步骤，使用 peter-evans/dockerhub-description 动作将 README.md 文件内容作为描述发布到 Docker Hub。这有助于保持 Docker镜像页面的描述与项目 README 一致，提高文档的可维护性。 --- .github/workflows/docker-image.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 76636d746..b2657a3e5 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -60,4 +60,13 @@ jobs: cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:buildcache,mode=max labels: | org.opencontainers.image.created=${{ steps.tags.outputs.date_tag }} - org.opencontainers.image.revision=${{ github.sha }} \ No newline at end of file + org.opencontainers.image.revision=${{ github.sha }} + + - name: Docker Hub Description + #这里是通过md文件自动生成dockerhub描述的模块，也可以不需要 + uses: peter-evans/dockerhub-description@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + repository: MaiM-with-u/MaiBot + readme-filepath: ./README.md \ No newline at end of file From 2e195808d9882bf41e93f1adcafb75addabcba00 Mon Sep 17 00:00:00 2001 From: infinitycat Date: Sat, 5 Apr 2025 00:06:53 +0800 Subject: [PATCH 7/9] =?UTF-8?q?build(docker):=20=E6=9B=B4=E6=96=B0=20Docke?= =?UTF-8?q?r=E9=95=9C=E5=83=8F=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 core 容器的镜像版本从 :latest 改为 :main- 注释掉的镜像版本也从 :latest 改为 :main --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1e469cf5a..bde382e5f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,8 +19,8 @@ services: - maim_bot core: container_name: maim-bot-core - image: sengokucola/maimbot:latest - # image: infinitycat/maimbot:latest + image: sengokucola/maimbot:main + # image: infinitycat/maimbot:main environment: - TZ=Asia/Shanghai # - EULA_AGREE=35362b6ea30f12891d46ef545122e84a # 同意EULA From 5fab8aada4876525754a0db6eb4d89954a1e7870 Mon Sep 17 00:00:00 2001 From: infinitycat Date: Sat, 5 Apr 2025 00:10:58 +0800 Subject: [PATCH 8/9] =?UTF-8?q?build(docker):=20=E6=9B=B4=E6=96=B0=20Docke?= =?UTF-8?q?r=E9=95=9C=E5=83=8F=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 core 容器的镜像版本从 :latest 改为 :main- 注释掉的镜像版本也从 :latest 改为 :main --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index b2657a3e5..9e37b8a83 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -67,6 +67,6 @@ jobs: uses: peter-evans/dockerhub-description@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} + password: ${{ secrets.DOCKERHUB_TOKEN }} repository: MaiM-with-u/MaiBot readme-filepath: ./README.md \ No newline at end of file From b0d26a9fd9226b61aeef9ae7da587c36e33ad9e2 Mon Sep 17 00:00:00 2001 From: infinitycat Date: Sat, 5 Apr 2025 00:13:59 +0800 Subject: [PATCH 9/9] =?UTF-8?q?build(docker):=20=E6=9B=B4=E6=96=B0=20Docke?= =?UTF-8?q?r=E9=95=9C=E5=83=8F=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 core 容器的镜像版本从 :latest 改为 :main- 注释掉的镜像版本也从 :latest 改为 :main --- .github/workflows/docker-image.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 9e37b8a83..76636d746 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -60,13 +60,4 @@ jobs: cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:buildcache,mode=max labels: | org.opencontainers.image.created=${{ steps.tags.outputs.date_tag }} - org.opencontainers.image.revision=${{ github.sha }} - - - name: Docker Hub Description - #这里是通过md文件自动生成dockerhub描述的模块，也可以不需要 - uses: peter-evans/dockerhub-description@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - repository: MaiM-with-u/MaiBot - readme-filepath: ./README.md \ No newline at end of file + org.opencontainers.image.revision=${{ github.sha }} \ No newline at end of file