diff --git a/.github/ISSUE_TEMPLATE/1-Update-Needed.yml b/.github/ISSUE_TEMPLATE/1-Update-Needed.yml index 64cbda57f..b43198b08 100644 --- a/.github/ISSUE_TEMPLATE/1-Update-Needed.yml +++ b/.github/ISSUE_TEMPLATE/1-Update-Needed.yml @@ -1,5 +1,5 @@ -name: "⏰为应用催更" -description: "报告缺陷来帮助我们完善。 / Create a report to help us improve" +name: "⏰应用有新版本了! / App has a new version!" +description: "当前应用商店中的应用有新版本,才可填此表单。 / Fill in this form only if the app in the appstore has a new version." title: "[需要更新应用] 哪个应用需要更新? / Which app needs an update?" labels: - Update Needed @@ -8,6 +8,8 @@ body: attributes: value: | ## Welcome! + **当前应用商店中的应用有新版本,才可填此表单。** + **Fill in this form only if the app in the appstore has a new version.** - type: input attributes: diff --git a/.github/ISSUE_TEMPLATE/2-Add-New-App.yml b/.github/ISSUE_TEMPLATE/2-Add-New-App.yml index 689dbe52c..801c60a63 100644 --- a/.github/ISSUE_TEMPLATE/2-Add-New-App.yml +++ b/.github/ISSUE_TEMPLATE/2-Add-New-App.yml @@ -1,5 +1,5 @@ name: "📝提交新应用 / Add New App" -description: "报告缺陷来帮助我们完善。 / Create a report to help us improve" +description: "有当前应用商店未收录的应用,请提交此表单。 / Please submit this form for apps not yet listed in the app store." title: "[需要增加应用] 需要增加哪个应用? / Which app needs to be added?" labels: - Add New App diff --git a/.github/workflows/merge-prs.yml b/.github/workflows/merge-prs.yml index 79cde2a86..fbacb2993 100644 --- a/.github/workflows/merge-prs.yml +++ b/.github/workflows/merge-prs.yml @@ -31,7 +31,7 @@ jobs: - name: 合并 PR run: | for pr in ${{ steps.get-prs.outputs.pr_list }}; do - if ! gh pr merge $pr --merge --delete-branch --body ""; then + if ! gh pr merge $pr --squash --delete-branch --body ""; then echo "⚠️ 合并 PR #$pr 失败" else echo "✅ 合并 PR #$pr 成功"