Merge pull request #729 from RayWangQvQ/develop

Fix[#728]: compatible with qinglong history versions
RayWangQvQ · May 18, 2024 · 2b47c81 · 2b47c81
2 parents 1c088d0 + e772d3c
commit 2b47c81
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 32 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-report----.md b/.github/ISSUE_TEMPLATE/bug-report----.md
@@ -7,7 +7,8 @@ assignees: ''
 
 ---
 
-<!-- 请完整勾选或填写如下信息 -->
+<!-- 请完整填写如下信息 -->
+<!-- 勾选项可以在提交之后，进行勾选 -->
 
 ### 版本
 
@@ -59,4 +60,4 @@ BiliTool版本号：`x.x.x`
 <这里>
 ```
 
-</details>
+</details>
diff --git a/.github/ISSUE_TEMPLATE/bug-report-qinglong----.md b/.github/ISSUE_TEMPLATE/bug-report-qinglong----.md
@@ -7,7 +7,8 @@ assignees: ''
 
 ---
 
-<!-- 请完整勾选或填写如下信息 -->
+<!-- 请完整填写如下信息 -->
+<!-- 勾选项可以在提交之后，进行勾选 -->
 
 ### 版本
 
@@ -18,7 +19,8 @@ BiliTool版本号：`x.x.x`
 ### 确认
 
 - [ ] 是的，我已搜索并确认，没有其他相同的议题
-- [ ] 是的，我确认，已尝试升级到最新版，但未解决
+- [ ] 是的，我确认，已尝试升级bilitool到最新版，但未解决
+- [ ] 是的，我确认，已尝试升级青龙到最新版，但未解决
 
 ### 服务器架构
 

diff --git a/.github/ISSUE_TEMPLATE/feature-request----.md b/.github/ISSUE_TEMPLATE/feature-request----.md
@@ -7,7 +7,8 @@ assignees: ''
 
 ---
 
-<!-- 请完整勾选或填写如下信息 -->
+<!-- 请完整填写如下信息 -->
+<!-- 勾选项可以在提交之后，进行勾选 -->
 
 ### 确认
 

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,7 +1,4 @@
-<!-- 请PR到我的develop分支 -->
-
-<!-- 如果您明白正在做什么，请将下一行中符号【】内的文字由“no”修改为“yes”（不含引号） -->
-<!-- 请问您是否明白：【no】 -->
+<!-- 请详细描述你要PR的内容 -->
 
 ### 内容
 

diff --git a/.github/workflows/auto-close-pr.yml b/.github/workflows/auto-close-pr.yml
@@ -1,20 +1,10 @@
 # 自动关闭不规范PR
-name: AutocloserPR
+name: AutoSetPR
 on:
   pull_request_target:
     types: [opened, edited]
 
 jobs:
-  Autoclose:
-    runs-on: ubuntu-latest
-    if: github.repository == 'RayWangQvQ/BiliBiliToolPro'
-    steps:
-    - uses: roots/issue-closer@v1.1
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        pr-close-message: "This PR was automatically closed because it did not meet the requirements, please check the requirements."
-        pr-pattern: ".*请问您是否明白：【yes】 -->.*"
-
   checkTargetBranch:
     runs-on: ubuntu-latest
     needs: Autoclose

diff --git a/.github/workflows/publish-image.yml b/.github/workflows/publish-image.yml
@@ -1,11 +1,9 @@
+# ·¢²¼¾µÏñ
 name: Publish image
 
 on:
   workflow_dispatch:
     inputs:
-      manualTag:
-        description: 'Manual Tag'
-        required: true
       autoWithLatestTag:
         description: 'Auto Add Latest Tag'
         required: true

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -34,8 +34,12 @@ jobs:
         run: |
           content=$(sed -n '/^## /{p;:a;n;/^## /q;p;ba}' CHANGELOG.md)
           version=$(echo "$GITHUB_REF" | sed 's/refs\/tags\///')
-          echo "::set-output name=content::$content"
-          echo "::set-output name=version::$version"
+          echo "version=$version" >> $GITHUB_OUTPUT
+          {
+            echo 'content<<EOF'
+            echo '$content'
+            echo EOF
+          } >> "$GITHUB_OUTPUT"
 
       - name: Create Release
         uses: softprops/action-gh-release@v1
@@ -44,7 +48,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           name: "BiliBiliToolPro-V${{ steps.release_notes.outputs.version }}"
           tag_name: ${{ github.event.inputs.version }}
-          body: ${{ steps.release_notes.outputs.content }}
+          body: '${{ steps.release_notes.outputs.content }}'
           discussion_category_name: Announcements
           generate_release_notes: true
           fail_on_unmatched_files: true
diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
@@ -1,9 +1,7 @@
+# ºÏ²¢main·ÖÖ§ºó´òtag
 name: Tag
 
 on:
-  push:
-    branches:
-      - main
   pull_request:
     types:
       - closed
@@ -29,5 +27,5 @@ jobs:
       - name: Tag and push
         run: |
           new_tag="${{ steps.current_version.outputs.current_version }}"
-          git tag "$new_tag"
-          git push origin "$new_tag"
+          git tag -f "$new_tag"
+          git push -f origin "$new_tag"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2.1.2
+- Feature: enhancement CICD scripts
+- Fix[#728]: compatible with qinglong history versions 
 ## 2.1.1
 - Feature: listen ctrl+c at the very beginning
 - Fix: fix qinglong read cron error

diff --git a/Ray.BiliBiliTool.sln b/Ray.BiliBiliTool.sln
@@ -116,6 +116,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ISSUE_TEMPLATE", "ISSUE_TEMPLATE", "{830361B7-BCC1-4853-879A-761B0FD86826}"
 	ProjectSection(SolutionItems) = preProject
 		.github\ISSUE_TEMPLATE\bug-report----.md = .github\ISSUE_TEMPLATE\bug-report----.md
+		.github\ISSUE_TEMPLATE\bug-report-qinglong----.md = .github\ISSUE_TEMPLATE\bug-report-qinglong----.md
 		.github\ISSUE_TEMPLATE\feature-request----.md = .github\ISSUE_TEMPLATE\feature-request----.md
 		.github\ISSUE_TEMPLATE\other----.md = .github\ISSUE_TEMPLATE\other----.md
 	EndProjectSection

diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Authors>Ray</Authors>
-    <Version>2.1.1</Version>
+    <Version>2.1.2</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
   </PropertyGroup>
 </Project>
diff --git a/qinglong/DefaultTasks/bili_task_base.sh b/qinglong/DefaultTasks/bili_task_base.sh
@@ -72,6 +72,10 @@ MemoryWarn=${MemoryWarn:-""}
 DiskWarn=${DiskWarn:-""}
 
 dir_repo=${dir_repo:-"$QL_DIR/data/repo"}
+# 需要兼容老版本青龙，https://github.com/RayWangQvQ/BiliBiliToolPro/issues/728
+if [ ! -d "$dir_repo" ] && [ -d "$QL_DIR/repo" ]; then
+  dir_repo="$QL_DIR/repo"
+fi
 dir_shell=$QL_DIR/shell
 touch $dir_shell/env.sh && . $dir_shell/env.sh
 touch /root/.bashrc && . /root/.bashrc

diff --git a/qinglong/DefaultTasks/dev/bili_dev_task_base.sh b/qinglong/DefaultTasks/dev/bili_dev_task_base.sh
@@ -72,6 +72,10 @@ MemoryWarn=${MemoryWarn:-""}
 DiskWarn=${DiskWarn:-""}
 
 dir_repo=${dir_repo:-"$QL_DIR/data/repo"}
+# 需要兼容老版本青龙，https://github.com/RayWangQvQ/BiliBiliToolPro/issues/728
+if [ ! -d "$dir_repo" ] && [ -d "$QL_DIR/repo" ]; then
+  dir_repo="$QL_DIR/repo"
+fi
 dir_shell=$QL_DIR/shell
 touch $dir_shell/env.sh && . $dir_shell/env.sh
 touch /root/.bashrc && . /root/.bashrc