Skip to content

Commit

Permalink
update CICD scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
RayWangQvQ committed May 14, 2024
1 parent cb0a9fb commit bd73f76
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 27 deletions.
5 changes: 1 addition & 4 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
<!-- 请PR到我的develop分支 -->

<!-- 如果您明白正在做什么,请将下一行中符号【】内的文字由“no”修改为“yes”(不含引号) -->
<!-- 请问您是否明白:【no】 -->
<!-- 请详细描述你要PR的内容 -->

### 内容

Expand Down
12 changes: 1 addition & 11 deletions .github/workflows/auto-close-pr.yml
Original file line number Diff line number Diff line change
@@ -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/[email protected]
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
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/publish-image.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
8 changes: 3 additions & 5 deletions .github/workflows/tag.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
# ºÏ²¢main·ÖÖ§ºó´òtag
name: Tag

on:
push:
branches:
- main
pull_request:
types:
- closed
Expand All @@ -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"
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
## 2.1.2
- Feature: enhancement CICD scripts
## 2.1.1
- Feature: listen ctrl+c at the very beginning
- Fix: fix qinglong read cron error
Expand Down
2 changes: 1 addition & 1 deletion common.props
Original file line number Diff line number Diff line change
@@ -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>

0 comments on commit bd73f76

Please sign in to comment.