From 75cffdaeb0b41d20620fb93d9aaa239e16a81e2b Mon Sep 17 00:00:00 2001 From: SengokuCola <1026294844@qq.com> Date: Tue, 1 Apr 2025 21:17:30 +0800 Subject: [PATCH 1/4] Update README.md --- README.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/README.md b/README.md index 8dea5bc15..3c64f5198 100644 --- a/README.md +++ b/README.md @@ -54,15 +54,7 @@ - 特别致敬在交流群中积极答疑的社区成员，你们自发维护的氛围令人感动❤️ ，maim哭了 - **重构期间的非代码贡献同样珍贵**：文档改进、测试用例补充、用户反馈整理等，欢迎通过Issue认领任务！ ---- -### **📬 高效协作小贴士** - -1. **提交前请先讨论**：创建Issue描述问题，确认是否符合`main-fix`修复范围 -2. **对重构提出您的想法**：如果您对重构版有自己的想法，欢迎提交讨论issue亟需测试伙伴，欢迎邮件联系`team@xxx.org`报名 -3. **部分main-fix的功能在issue讨论后，经过严格讨论，一致决定可以添加功能改动或修复的，可以提交pr** - ---- **谢谢大家谢谢大家谢谢大家谢谢大家谢谢大家谢谢大家！** 虽然此刻不得不放缓脚步，但这一切都是为了跳得更高。期待在重构完成后与各位共建更强大的版本！ From a1cb618550843db40649a01c0cfcedbec4767636 Mon Sep 17 00:00:00 2001 From: SengokuCola <1026294844@qq.com> Date: Fri, 4 Apr 2025 17:56:18 +0800 Subject: [PATCH 2/4] Revert "Update README.md" This reverts commit 75cffdaeb0b41d20620fb93d9aaa239e16a81e2b. --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 3c64f5198..8dea5bc15 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,15 @@ - 特别致敬在交流群中积极答疑的社区成员，你们自发维护的氛围令人感动❤️ ，maim哭了 - **重构期间的非代码贡献同样珍贵**：文档改进、测试用例补充、用户反馈整理等，欢迎通过Issue认领任务！ +--- +### **📬 高效协作小贴士** + +1. **提交前请先讨论**：创建Issue描述问题，确认是否符合`main-fix`修复范围 +2. **对重构提出您的想法**：如果您对重构版有自己的想法，欢迎提交讨论issue亟需测试伙伴，欢迎邮件联系`team@xxx.org`报名 +3. **部分main-fix的功能在issue讨论后，经过严格讨论，一致决定可以添加功能改动或修复的，可以提交pr** + +--- **谢谢大家谢谢大家谢谢大家谢谢大家谢谢大家谢谢大家！** 虽然此刻不得不放缓脚步，但这一切都是为了跳得更高。期待在重构完成后与各位共建更强大的版本！ From aebea9022adeaeb0857213bcb205c86a9ead880f Mon Sep 17 00:00:00 2001 From: infinitycat Date: Fri, 4 Apr 2025 18:28:03 +0800 Subject: [PATCH 3/4] =?UTF-8?q?ci(docker):=20=E6=9B=B4=E6=96=B0=20Docker?= =?UTF-8?q?=E9=95=9C=E5=83=8F=E6=9E=84=E5=BB=BA=E5=92=8C=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除仅在 refactor 分支执行的 maim_message 克隆步骤 - 更新分支标签配置: - main 分支构建 main 和 main-时间戳 标签 - 新增 classical、dev 和 knowledge 分支的构建配置 - 删除 main-fix 和 refactor 分支的特殊处理逻辑 --- .github/workflows/docker-image.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 29fd6fd44..1049ec3f8 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -4,8 +4,9 @@ on: push: branches: - main - - main-fix - - refactor # 新增 refactor 分支触发 + - classical + - dev + - new_knowledge tags: - 'v*' workflow_dispatch: @@ -21,7 +22,6 @@ jobs: uses: actions/checkout@v4 - name: Clone maim_message (refactor branch only) - if: github.ref == 'refs/heads/refactor' # 仅 refactor 分支执行 run: git clone https://github.com/MaiM-with-u/maim_message maim_message - name: Set up Docker Buildx @@ -39,11 +39,13 @@ jobs: if [[ "${{ github.ref }}" == refs/tags/* ]]; then echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:${{ github.ref_name }},${{ secrets.DOCKERHUB_USERNAME }}/maimbot:latest" >> $GITHUB_OUTPUT elif [ "${{ github.ref }}" == "refs/heads/main" ]; then - echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:main,${{ secrets.DOCKERHUB_USERNAME }}/maimbot:latest" >> $GITHUB_OUTPUT - elif [ "${{ github.ref }}" == "refs/heads/main-fix" ]; then - echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:main-fix" >> $GITHUB_OUTPUT - elif [ "${{ github.ref }}" == "refs/heads/refactor" ]; then # 新增 refactor 分支处理 - echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:refactor,${{ secrets.DOCKERHUB_USERNAME }}/maimbot:refactor$(date -u +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT + echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:main,${{ secrets.DOCKERHUB_USERNAME }}/maimbot:main-$(date -u +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT + elif [ "${{ github.ref }}" == "refs/heads/classical" ]; then + echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:classical,${{ secrets.DOCKERHUB_USERNAME }}/maimbot:classical-$(date -u +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT + elif [ "${{ github.ref }}" == "refs/heads/dev" ]; then + echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:dev,${{ secrets.DOCKERHUB_USERNAME }}/maimbot:dev-$(date -u +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT + elif [ "${{ github.ref }}" == "refs/heads/knowledge" ]; then + echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:knowledge,${{ secrets.DOCKERHUB_USERNAME }}/maimbot:knowledge-$(date -u +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT fi - name: Build and Push Docker Image From 94f46c4700d0e6ec2671413c116c22c16e3ae598 Mon Sep 17 00:00:00 2001 From: infinitycat Date: Fri, 4 Apr 2025 18:45:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?ci(docker):=20=E6=9B=B4=E6=96=B0=20Docker?= =?UTF-8?q?=E9=95=9C=E5=83=8F=E6=9E=84=E5=BB=BA=E5=92=8C=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除仅在 refactor 分支执行的 maim_message 克隆步骤 - 更新分支标签配置: - main 分支构建 main 和 main-时间戳 标签 - 新增 classical、dev 和 knowledge 分支的构建配置 - 删除 main-fix 和 refactor 分支的特殊处理逻辑 --- .github/workflows/docker-image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 1049ec3f8..76636d746 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -21,7 +21,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Clone maim_message (refactor branch only) + - name: Clone maim_message run: git clone https://github.com/MaiM-with-u/maim_message maim_message - name: Set up Docker Buildx @@ -44,7 +44,7 @@ jobs: echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:classical,${{ secrets.DOCKERHUB_USERNAME }}/maimbot:classical-$(date -u +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT elif [ "${{ github.ref }}" == "refs/heads/dev" ]; then echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:dev,${{ secrets.DOCKERHUB_USERNAME }}/maimbot:dev-$(date -u +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT - elif [ "${{ github.ref }}" == "refs/heads/knowledge" ]; then + elif [ "${{ github.ref }}" == "refs/heads/new_knowledge" ]; then echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:knowledge,${{ secrets.DOCKERHUB_USERNAME }}/maimbot:knowledge-$(date -u +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT fi