8

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

Hide file tree

Showing 3 changed files with 29 additions and 57 deletions.
diff --git a/.github/workflows/release-macos-homebrew.yml b/.github/workflows/release-macos-homebrew.yml
@@ -160,28 +160,14 @@ jobs:
           release_name: GoldenDict-ng-v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
           prerelease: ${{env.prerelease}}
           body: |
-            #### Install instructions for Windows, macOS and Linux 
-
-            <https://xiaoyifang.github.io/goldendict-ng/install/>.
-
-            #### Filename pattern (文件名模式): **[Qt version]-GoldenDict-ng-[OS]-[release-date].[ext]**  
-
-            Windows users can use either `****-installer.exe` (for installer) or `****.zip` (unzip and run).
-            The `goldendict.exe` can be dropped into previous installation's folder (if dependencies aren't changed).
-
-            Linux users can use Flatpak or build from source.
-            https://flathub.org/apps/io.github.xiaoyifang.goldendict_ng
-
-            macOS users can use `.dmg` installer.
-
-            `6.5.1-GoldenDict.exe_windows-2019_20230701.zip` means built with Qt6.5.1, windows/msvc-2019 at 20230701 as a zip archive.
-
-            #### Build Details
-
-            macOS: macOS-12 (x86_64) and macOS-14 (Arm)
-            Windows: Visual studio 2019
-            based on: ${{github.ref_name}}
-
+            [Install instructions for Windows, macOS and Linux](https://xiaoyifang.github.io/goldendict-ng/install/).
+            
+            Filaname pattern: GoldenDict-[version]-[Qt version]-[system name]-...
+            
+            For Linux, released vesion is on Flathub -> [io.github.xiaoyifang.goldendict_ng](https://flathub.org/apps/io.github.xiaoyifang.goldendict_ng).
+  
+            Based on branch: ${{github.ref_name}}
+
             #### Changes
 
-            ${{steps.build_changelog.outputs.changelog}}
+            ${{steps.build_changelog.outputs.changelog}}
diff --git a/.github/workflows/release-windows-vcpkg-cmake.yml b/.github/workflows/release-windows-vcpkg-cmake.yml
@@ -145,27 +145,13 @@ jobs:
           $tagName = "v$env:version-$env:versionSuffix.$(git rev-parse --short=8 HEAD)"
           
           $changeNotes = "
-          #### Install instructions for Windows, macOS and Linux 
-
-          <https://xiaoyifang.github.io/goldendict-ng/install/>.
-
-          #### Filename pattern (文件名模式): **[Qt version]-GoldenDict-ng-[OS]-[release-date].[ext]**  
-
-          Windows users can use either `****-installer.exe` (for installer) or `****.zip` (unzip and run).
-          The `goldendict.exe` can be dropped into previous installation's folder (if dependencies aren't changed).
-
-          Linux users can use Flatpak or build from source.
-          https://flathub.org/apps/io.github.xiaoyifang.goldendict_ng
-
-          macOS users can use `.dmg` installer.
-
-          `6.5.1-GoldenDict.exe_windows-2019_20230701.zip` means built with Qt6.5.1, windows/msvc-2019 at 20230701 as a zip archive.
-
-          #### Build Details
+          [Install instructions for Windows, macOS and Linux](https://xiaoyifang.github.io/goldendict-ng/install/).
+          
+          Filaname pattern: GoldenDict-[version]-[Qt version]-[system name]-...
+          
+          For Linux, released vesion is on Flathub -> [io.github.xiaoyifang.goldendict_ng](https://flathub.org/apps/io.github.xiaoyifang.goldendict_ng).
 
-          macOS: macOS-12 (x86_64) and macOS-14 (Arm)
-          Windows: Visual studio 2019
-          based on: ${{github.ref_name}}
+          Based on branch: ${{github.ref_name}}
 
           #### Changes
           
@@ -184,8 +170,8 @@ jobs:
           # file name after # is display label
           
           cd './build_dir'
-          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
+          gh release upload "${tagName}"  GoldenDict-${{env.version}}-Qt${{matrix.qt_ver}}.7z#GoldenDict-${{env.version}}-Qt${{matrix.qt_ver}}-Windows.7z  --clobber
+          gh release upload "${tagName}"  GoldenDict-${{env.version}}-Qt${{matrix.qt_ver}}.exe#GoldenDict-${{env.version}}-Qt${{matrix.qt_ver}}-Windows-installer.exe  --clobber
           
           cd './goldendict'
           gh release upload "${tagName}"  goldendict.exe#GoldenDict-${{env.version}}-Qt${{matrix.qt_ver}}-main-executable-file-only.exe  --clobber

diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml
@@ -7,18 +7,18 @@ on:
   #   workflows: [AutoTag]
   #   types: [completed]
   workflow_dispatch:
-  push:
-    branches:
-      - dev
-      - master
-      - experimental
-      # - staged
-    paths-ignore:
-      - 'docs/**'
-      # - ".github/**"
-      - "howto/**"
-      - "*.md"
-      - ".clang-format"      
+#  push:
+#    branches:
+#      - dev
+#      - master
+#      - experimental
+#      # - staged
+#    paths-ignore:
+#      - 'docs/**'
+#      # - ".github/**"
+#      - "howto/**"
+#      - "*.md"
+#      - ".clang-format"
 
 jobs:
   build: