Merge pull request #289 from AmiyaBot/V6-dev

update 合并工作流
AmiyaBot · Sep 19, 2024 · 7610824 · 7610824
2 parents 0e87b41 + 4369228
commit 7610824
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 34 deletions.
diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml
@@ -35,3 +35,24 @@ jobs:
                 run: |
                     venv\Scripts\Activate.ps1
                     venv\Scripts\python run_build.py --type package --upload
+
+    publish-docker:
+        runs-on: ubuntu-latest
+        steps:
+            -   name: Checkout
+                uses: actions/checkout@v4
+            -   name: Set up QEMU
+                uses: docker/setup-qemu-action@v3
+            -   name: Set up Docker Buildx
+                uses: docker/setup-buildx-action@v3
+            -   name: Login to Docker Hub
+                uses: docker/login-action@v3
+                with:
+                    username: ${{ secrets.DOCKERHUB_USERNAME }}
+                    password: ${{ secrets.DOCKERHUB_TOKEN }}
+            -   name: Build and push
+                uses: docker/build-push-action@v6
+                with:
+                    context: .
+                    push: true
+                    tags: amiyabot/amiyabot:latest
diff --git a/core/util/common.py b/core/util/common.py
@@ -359,10 +359,12 @@ def sorted_dict(data: dict, *args, **kwargs):
 def text_to_pinyin(text: str):
     return ''.join([item[0] for item in pypinyin.pinyin(text, style=pypinyin.NORMAL)]).lower()
 
+
 def get_resource_dir():
     absolute_path = os.path.abspath('./resource')
     return absolute_path
 
+
 def get_plugin_dir():
     absolute_path = os.path.abspath('./plugins')
-    return absolute_path
+    return absolute_path