From c61552614221d21421b3ea61454d5e1e340ec0b8 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 7 Nov 2025 02:37:55 +0000 Subject: [PATCH] ci: Address code review feedback - Fix grammatical error in Chinese text (release-info.md) - Use jq for reliable JSON parsing instead of grep with Perl regex - Improve error handling with clearer warning messages Co-authored-by: sj817 <74231782+sj817@users.noreply.github.com> --- .github/release-template/release-info.md | 2 +- .github/workflows/release.yml | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/release-template/release-info.md b/.github/release-template/release-info.md index 3df8a714..3ba7c1c3 100644 --- a/.github/release-template/release-info.md +++ b/.github/release-template/release-info.md @@ -1,7 +1,7 @@ [使用文档](https://napneko.github.io/) ## Windows 一键包 -我们为提供了的轻量化一键部署方案 +我们提供了轻量化一键部署方案 相对于普通需要安装QQ的方案,下面已内置QQ和Napcat 阅读使用文档参考 你可以下载 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 998b75a6..69efa2fd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -138,10 +138,13 @@ jobs: - name: Download Windows OneKey Packages run: | - LATEST_RELEASE=$(curl -s https://api.github.com/repos/NapNeko/NapCatQQ/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")') + # Get latest release tag using jq for reliable JSON parsing + LATEST_RELEASE=$(curl -s https://api.github.com/repos/NapNeko/NapCatQQ/releases/latest | jq -r '.tag_name') echo "Latest release: $LATEST_RELEASE" - curl -L -o NapCat.Shell.Windows.OneKey.zip "https://github.com/NapNeko/NapCatQQ/releases/download/$LATEST_RELEASE/NapCat.Shell.Windows.OneKey.zip" || echo "Shell OneKey not found, will skip" - curl -L -o NapCat.Framework.Windows.OneKey.zip "https://github.com/NapNeko/NapCatQQ/releases/download/$LATEST_RELEASE/NapCat.Framework.Windows.OneKey.zip" || echo "Framework OneKey not found, will skip" + + # Download OneKey packages if they exist (non-zero exit code won't fail the step) + curl -f -L -o NapCat.Shell.Windows.OneKey.zip "https://github.com/NapNeko/NapCatQQ/releases/download/$LATEST_RELEASE/NapCat.Shell.Windows.OneKey.zip" || echo "Warning: NapCat.Shell.Windows.OneKey.zip not found in latest release" + curl -f -L -o NapCat.Framework.Windows.OneKey.zip "https://github.com/NapNeko/NapCatQQ/releases/download/$LATEST_RELEASE/NapCat.Framework.Windows.OneKey.zip" || echo "Warning: NapCat.Framework.Windows.OneKey.zip not found in latest release" - name: Generate Release Notes run: |