From 18f4973d0a6828bd07cb89641c53284bc3051227 Mon Sep 17 00:00:00 2001 From: dijunkun Date: Fri, 14 Nov 2025 16:10:00 +0800 Subject: [PATCH] [fix] remove duplicate 'v' prefix in GitHub release name --- .github/workflows/build.yml | 38 +++++++++++++++++--------------- src/gui/windows/about_window.cpp | 11 ++++++--- 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5c9c12d..38b665d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -342,9 +342,11 @@ jobs: SHORT_SHA=$(echo "${GITHUB_SHA}" | cut -c1-7) BUILD_DATE=$(date +%Y%m%d) BUILD_DATE_ISO=$(date +%Y-%m-%d) - VERSION_NUM="v${VERSION#v}-${BUILD_DATE}-${SHORT_SHA}" + VERSION_NUM="${VERSION#v}-${BUILD_DATE}-${SHORT_SHA}" + VERSION_WITH_V="v${VERSION_NUM}" VERSION_ONLY="${VERSION#v}" echo "VERSION_NUM=${VERSION_NUM}" >> $GITHUB_OUTPUT + echo "VERSION_WITH_V=${VERSION_WITH_V}" >> $GITHUB_OUTPUT echo "VERSION_ONLY=${VERSION_ONLY}" >> $GITHUB_OUTPUT echo "BUILD_DATE=${BUILD_DATE}" >> $GITHUB_OUTPUT echo "BUILD_DATE_ISO=${BUILD_DATE_ISO}" >> $GITHUB_OUTPUT @@ -352,11 +354,11 @@ jobs: - name: Rename artifacts run: | mkdir -p release - cp artifacts/crossdesk-macos-x64-${{ steps.version.outputs.VERSION_NUM }}/* release/crossdesk-macos-x64-${{ steps.version.outputs.VERSION_NUM }}.pkg - cp artifacts/crossdesk-macos-arm64-${{ steps.version.outputs.VERSION_NUM }}/* release/crossdesk-macos-arm64-${{ steps.version.outputs.VERSION_NUM }}.pkg - cp artifacts/crossdesk-linux-amd64-${{ steps.version.outputs.VERSION_NUM }}/* release/crossdesk-linux-amd64-${{ steps.version.outputs.VERSION_NUM }}.deb - cp artifacts/crossdesk-linux-arm64-${{ steps.version.outputs.VERSION_NUM }}/* release/crossdesk-linux-arm64-${{ steps.version.outputs.VERSION_NUM }}.deb - cp artifacts/crossdesk-win-x64-${{ steps.version.outputs.VERSION_NUM }}/* release/crossdesk-win-x64-${{ steps.version.outputs.VERSION_NUM }}.exe + cp artifacts/crossdesk-macos-x64-${{ steps.version.outputs.VERSION_WITH_V }}/* release/crossdesk-macos-x64-${{ steps.version.outputs.VERSION_WITH_V }}.pkg + cp artifacts/crossdesk-macos-arm64-${{ steps.version.outputs.VERSION_WITH_V }}/* release/crossdesk-macos-arm64-${{ steps.version.outputs.VERSION_WITH_V }}.pkg + cp artifacts/crossdesk-linux-amd64-${{ steps.version.outputs.VERSION_WITH_V }}/* release/crossdesk-linux-amd64-${{ steps.version.outputs.VERSION_WITH_V }}.deb + cp artifacts/crossdesk-linux-arm64-${{ steps.version.outputs.VERSION_WITH_V }}/* release/crossdesk-linux-arm64-${{ steps.version.outputs.VERSION_WITH_V }}.deb + cp artifacts/crossdesk-win-x64-${{ steps.version.outputs.VERSION_WITH_V }}/* release/crossdesk-win-x64-${{ steps.version.outputs.VERSION_WITH_V }}.exe - name: List release files run: ls -lh release/ @@ -364,8 +366,8 @@ jobs: - name: Upload to Versioned GitHub Release uses: softprops/action-gh-release@v2 with: - tag_name: v${{ steps.version.outputs.VERSION_NUM }} - name: Release v${{ steps.version.outputs.VERSION_NUM }} + tag_name: ${{ steps.version.outputs.VERSION_WITH_V }} + name: Release ${{ steps.version.outputs.VERSION_WITH_V }} draft: false prerelease: false files: release/* @@ -408,24 +410,24 @@ jobs: "releaseDate": "${{ steps.version.outputs.BUILD_DATE_ISO }}", "downloads": { "windows-x64": { - "url": "https://downloads.crossdesk.cn/crossdesk-win-x64-${{ steps.version.outputs.VERSION_NUM }}.exe", - "filename": "crossdesk-win-x64-${{ steps.version.outputs.VERSION_NUM }}.exe" + "url": "https://downloads.crossdesk.cn/crossdesk-win-x64-${{ steps.version.outputs.VERSION_WITH_V }}.exe", + "filename": "crossdesk-win-x64-${{ steps.version.outputs.VERSION_WITH_V }}.exe" }, "macos-x64": { - "url": "https://downloads.crossdesk.cn/crossdesk-macos-x64-${{ steps.version.outputs.VERSION_NUM }}.pkg", - "filename": "crossdesk-macos-x64-${{ steps.version.outputs.VERSION_NUM }}.pkg" + "url": "https://downloads.crossdesk.cn/crossdesk-macos-x64-${{ steps.version.outputs.VERSION_WITH_V }}.pkg", + "filename": "crossdesk-macos-x64-${{ steps.version.outputs.VERSION_WITH_V }}.pkg" }, "macos-arm64": { - "url": "https://downloads.crossdesk.cn/crossdesk-macos-arm64-${{ steps.version.outputs.VERSION_NUM }}.pkg", - "filename": "crossdesk-macos-arm64-${{ steps.version.outputs.VERSION_NUM }}.pkg" + "url": "https://downloads.crossdesk.cn/crossdesk-macos-arm64-${{ steps.version.outputs.VERSION_WITH_V }}.pkg", + "filename": "crossdesk-macos-arm64-${{ steps.version.outputs.VERSION_WITH_V }}.pkg" }, "linux-amd64": { - "url": "https://downloads.crossdesk.cn/crossdesk-linux-amd64-${{ steps.version.outputs.VERSION_NUM }}.deb", - "filename": "crossdesk-linux-amd64-${{ steps.version.outputs.VERSION_NUM }}.deb" + "url": "https://downloads.crossdesk.cn/crossdesk-linux-amd64-${{ steps.version.outputs.VERSION_WITH_V }}.deb", + "filename": "crossdesk-linux-amd64-${{ steps.version.outputs.VERSION_WITH_V }}.deb" }, "linux-arm64": { - "url": "https://downloads.crossdesk.cn/crossdesk-linux-arm64-${{ steps.version.outputs.VERSION_NUM }}.deb", - "filename": "crossdesk-linux-arm64-${{ steps.version.outputs.VERSION_NUM }}.deb" + "url": "https://downloads.crossdesk.cn/crossdesk-linux-arm64-${{ steps.version.outputs.VERSION_WITH_V }}.deb", + "filename": "crossdesk-linux-arm64-${{ steps.version.outputs.VERSION_WITH_V }}.deb" } } } diff --git a/src/gui/windows/about_window.cpp b/src/gui/windows/about_window.cpp index 4369348..060e2c4 100644 --- a/src/gui/windows/about_window.cpp +++ b/src/gui/windows/about_window.cpp @@ -8,8 +8,10 @@ namespace crossdesk { -void Hyperlink(const std::string& label, const std::string& url) { +void Hyperlink(const std::string& label, const std::string& url, + const float window_width) { ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(0, 0, 255, 255)); + ImGui::SetCursorPosX(window_width * 0.1f); ImGui::Text("%s", label.c_str()); ImGui::PopStyleColor(); @@ -67,7 +69,8 @@ int Render::AboutWindow() { #endif std::string text = localization::version[localization_language_index_] + - ": CrossDesk v" + version; + ": CrossDesk " + version; + ImGui::SetCursorPosX(about_window_width_ * 0.1f); ImGui::Text("%s", text.c_str()); if (update_available_) { @@ -76,14 +79,16 @@ int Render::AboutWindow() { ": " + latest_version_; std::string access_website = localization::access_website[localization_language_index_]; - Hyperlink(latest_version, "https://crossdesk.cn"); + Hyperlink(latest_version, "https://crossdesk.cn", about_window_width_); } ImGui::Text(""); std::string copyright_text = "© 2025 by JUNKUN DI. All rights reserved."; std::string license_text = "Licensed under GNU LGPL v3."; + ImGui::SetCursorPosX(about_window_width_ * 0.1f); ImGui::Text("%s", copyright_text.c_str()); + ImGui::SetCursorPosX(about_window_width_ * 0.1f); ImGui::Text("%s", license_text.c_str()); ImGui::SetCursorPosX(about_window_width_ * 0.42f);