Fix github action build

.github/workflows/publish.yaml

@@ -40,8 +40,16 @@ jobs:
           tag: ${{ github.ref }}
           file_glob: true
       - name: Update manifest
-        uses: stefanzweifel/git-auto-commit-action@v4
+        uses: svenstaro/upload-release-action@v2
         with:
-          branch: ${{ env.branch }}
-          commit_message: Update repo manifest
-          file_pattern: "*.json"
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ./*.json
+          tag: "manifest"
+          overwrite: true
+          file_glob: true
+      # - name: Update manifest
+      #   uses: stefanzweifel/git-auto-commit-action@v4
+      #   with:
+      #     branch: ${{ env.branch }}
+      #     commit_message: Update repo manifest
+      #     file_pattern: "*.json"

build_plugin.py

@@ -28,7 +28,7 @@ if prerelease:
     jellyfin_repo_file = "./manifest-unstable.json"
 else:
     jellyfin_repo_file = "./manifest.json"
-jellyfin_repo_file_cn = jellyfin_repo_file.replace(".json", "_cn.json")
+# jellyfin_repo_file_cn = jellyfin_repo_file.replace(".json", "_cn.json")
 
 jellyfin_repo_url = "https://github.com/cxfksword/jellyfin-plugin-danmu/releases/download"
 
@@ -40,9 +40,9 @@ os.system('jprm repo add --url=%s %s %s' % (jellyfin_repo_url, jellyfin_repo_fil
 os.system('sed -i "s/\/danmu\//\/%s\//" %s' % (git_version, jellyfin_repo_file))
 
 # 国内加速
-os.system('cp -f %s %s' % (jellyfin_repo_file, jellyfin_repo_file_cn))
+# os.system('cp -f %s %s' % (jellyfin_repo_file, jellyfin_repo_file_cn))
 
-os.system('sed -i "s/github.com/raw.iqiq.io/" %s' % (jellyfin_repo_file_cn))
+# os.system('sed -i "s/github.com/ghproxy.com\/https:\/\/github.com/" %s' % (jellyfin_repo_file_cn))
 
 
 print(version)

manifest.json

@@ -1,4 +1,5 @@
 [
+<<<<<<< Updated upstream
     {
         "guid": "5b39da44-5314-4940-8e26-54c821c17f86",
         "name": "Danmu",
@@ -34,4 +35,34 @@
             }
         ]
     }
-]
+]
+=======
+  {
+    "guid": "5b39da44-5314-4940-8e26-54c821c17f86",
+    "name": "Danmu",
+    "description": "jellyfin\u7684b\u7ad9\u5f39\u5e55\u81ea\u52a8\u4e0b\u8f7d\u63d2\u4ef6\uff0c\u4f1a\u5339\u914db\u7ad9\u756a\u5267/\u7535\u5f71\u89c6\u9891\uff0c\u81ea\u52a8\u4e0b\u8f7d\u5bf9\u5e94\u5f39\u5e55\uff0c\u5e76\u5b9a\u65f6\u66f4\u65b0\u3002\n",
+    "overview": "jellyfin\u5f39\u5e55\u4e0b\u8f7d\u63d2\u4ef6",
+    "owner": "cxfksword",
+    "category": "Metadata",
+    "imageUrl": "https://raw.githubusercontent.com/cxfksword/jellyfin-plugin-danmu/main/doc/logo.png",
+    "versions": [
+      {
+        "version": "0.3.7.0",
+        "changelog": "NA\n",
+        "targetAbi": "10.8.0.0",
+        "sourceUrl": "https://github.com/cxfksword/jellyfin-plugin-danmu/releases/download/v0.3.7/danmu_0.3.7.0.zip",
+        "checksum": "a20cae62be38959b73f789c163d29d60",
+        "timestamp": "2022-10-11T09:34:09Z"
+      },
+      {
+        "version": "0.3.0.0",
+        "changelog": "NA\n",
+        "targetAbi": "10.8.0.0",
+        "sourceUrl": "https://github.com/cxfksword/jellyfin-plugin-danmu/releases/download/v0.3.0/danmu_0.3.0.0.zip",
+        "checksum": "97004fa644735773735c7503bfafeb85",
+        "timestamp": "2022-10-11T08:58:05Z"
+      }
+    ]
+  }
+]
+>>>>>>> Stashed changes