7

xiaoyifang · Jul 7, 2024 · 8a65975 · 8a65975
1 parent 34fa864
commit 8a65975
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/release-windows-vcpkg-cmake.yml b/.github/workflows/release-windows-vcpkg-cmake.yml
@@ -174,19 +174,21 @@ jobs:
 
           $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 --prerelease
             } else {
               gh release create ${tagName} --target ${{github.ref_name}} --notes "${changeNotes}" --latest=true 
             }
           }
 
+          # file name after # is display label
+          
           cd './build_dir'
-          gh release upload "${tagName}"  $(Get-ChildItem -Path '.\*' -Include @("*.7z","*.exe")  -Name)  --clobber
+          gh release upload "${tagName}"  GoldenDict-${{env.version}}-Qt${{matrix.qt_ver}}.7z#GoldenDict-${{env.version}}-Qt${{matrix.qt_ver}}-Windows-Installer.exe  --clobber
+          gh release upload "${tagName}"  GoldenDict-${{env.version}}-Qt${{matrix.qt_ver}}.exe#GoldenDict-${{env.version}}-Qt${{matrix.qt_ver}}-Windows.7z  --clobber
+          
           cd './goldendict'
-          gh release upload "${tagName}"  goldendict.exe#GoldenDict-${{env.version}}-Qt${{matrix.qt_ver}}-main-executable-file-only  --clobber
-          gh release upload "${tagName}"  goldendict.pdb#GoldenDict-${{env.version}}-Qt${{matrix.qt_ver}}-PDB-file-for-debug-only  --clobber
+          gh release upload "${tagName}"  goldendict.exe#GoldenDict-${{env.version}}-Qt${{matrix.qt_ver}}-main-executable-file-only.exe  --clobber
+          gh release upload "${tagName}"  goldendict.pdb#GoldenDict-${{env.version}}-Qt${{matrix.qt_ver}}-PDB-file-for-debug.pdb  --clobber
           cd ..
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -270,7 +270,7 @@ if (APPLE)
             --volicon ${CMAKE_SOURCE_DIR}/icons/macicon.icns \
             --icon \"${App_Name}\" 100 100
             --app-drop-link 300 100 \
-            \"GoldenDict-${CMAKE_PROJECT_VERSION}-Qt${Qt6_VERSION}-${CMAKE_SYSTEM_PROCESSOR}.dmg\" \
+            \"GoldenDict-${CMAKE_PROJECT_VERSION}-Qt${Qt6_VERSION}-macOS-${CMAKE_SYSTEM_PROCESSOR}.dmg\" \
             \"${Assembling_Dir}\")"
         )
     else ()
@@ -353,7 +353,7 @@ if (WIN32)
             PATTERN "*.ilk" EXCLUDE)
 
 
-    set(CPACK_PACKAGE_FILE_NAME "GoldenDict-${PROJECT_VERSION}-Qt${Qt6Widgets_VERSION}-${CMAKE_SYSTEM_NAME}-installer")
+    set(CPACK_PACKAGE_FILE_NAME "GoldenDict-${PROJECT_VERSION}-Qt${Qt6Widgets_VERSION}")
     set(CPACK_GENERATOR "7Z;NSIS64")
     set(CPACK_NSIS_MANIFEST_DPI_AWARE ON)
     set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")