diff --git a/.github/ISSUE_TEMPLATE/bug-report----.md b/.github/ISSUE_TEMPLATE/bug-report----.md index 871968086..378e96992 100644 --- 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` <这里> ``` - \ No newline at end of file + diff --git a/.github/ISSUE_TEMPLATE/bug-report-qinglong----.md b/.github/ISSUE_TEMPLATE/bug-report-qinglong----.md index ab144cd47..c3264a028 100644 --- 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 index 3fc4a945f..fda2f77b8 100644 --- 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 index 525670daf..6295e6634 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,7 +1,4 @@ - - - - + ### 内容 diff --git a/.github/workflows/auto-close-pr.yml b/.github/workflows/auto-close-pr.yml index 0e73ed50f..d291cce9c 100644 --- 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 index a31f8c10f..2356733fc 100644 --- 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 index bcfae54d4..c90bfb4ce 100644 --- 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<> "$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 index 81d28dfb3..954bd8543 100644 --- 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 index 5abf4504f..4d118ecca 100644 --- 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 index 2d67a6c97..c27d5bed0 100644 --- 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 index 0ec5d8885..34810691c 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ Ray - 2.1.1 + 2.1.2 $(NoWarn);CS1591;CS0436 diff --git a/qinglong/DefaultTasks/bili_task_base.sh b/qinglong/DefaultTasks/bili_task_base.sh index 8d78a8e4f..fc4629f1d 100644 --- 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 index bfe415103..84019263e 100644 --- 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