4

xiaoyifang · Jul 7, 2024 · 5da10e1 · 5da10e1
1 parent cd4d575
commit 5da10e1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/release-windows-vcpkg-cmake.yml b/.github/workflows/release-windows-vcpkg-cmake.yml
@@ -133,14 +133,14 @@ jobs:
       - name: CPack create package
         run: |
           cd './build_dir'
-          cpack --verbose --trace -G 7Z
+          cpack --verbose --trace
           cd ..
           pwd
       - name: Upload packages
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          $tagName = "v$env:version-$env:versionSuffix-$(git rev-parse --short=8 HEAD)"
+          $tagName = "v$env:version-$env:versionSuffix.$(git rev-parse --short=8 HEAD)"
           
           $changeNotes = "
           #### Install instructions for Windows, macOS and Linux 
@@ -168,10 +168,12 @@ jobs:
           #### Changes
           
           ${{steps.build_changelog.outputs.changelog}}
-          "
+          "          
 
           $tagExist = gh api --silent "repos/:owner/:repo/git/refs/tags/${{github.ref_name}}"
           if (-not $?) {
+            echo "true"
+            echo $env:prerelease
             if ($env:prerelease -eq "true") {
               gh release create ${tagName} --target ${{github.ref_name}} --notes "${changeNotes}" --latest=false
             } else {

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -353,8 +353,8 @@ if (WIN32)
             PATTERN "*.ilk" EXCLUDE)
 
 
-    set(CPACK_PACKAGE_FILE_NAME "GoldenDict-${PROJECT_VERSION}-${CMAKE_SYSTEM_NAME}-Qt${Qt6Widgets_VERSION}")
-    set(CPACK_GENERATOR "7Z;NSIS")
+    set(CPACK_PACKAGE_FILE_NAME "GoldenDict-${PROJECT_VERSION}-Qt${Qt6Widgets_VERSION}-${CMAKE_SYSTEM_NAME}-installer")
+    set(CPACK_GENERATOR "7Z;NSIS64")
     set(CPACK_NSIS_MANIFEST_DPI_AWARE ON)
     set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
     include(CPack)