Skip to content

Commit

Permalink
Merge branch 'staged' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
xiaoyifang committed Jul 9, 2024
2 parents 609caf8 + dcf4ff3 commit 174f902
Show file tree
Hide file tree
Showing 54 changed files with 441 additions and 268 deletions.
32 changes: 9 additions & 23 deletions .github/workflows/release-macos-homebrew.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
182 changes: 182 additions & 0 deletions .github/workflows/release-windows-vcpkg-cmake.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,182 @@
name: Release Windows Vcpkg CMake
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
on:
workflow_dispatch:
push:
branches:
- dev
- master
- experimental
paths-ignore:
- 'docs/**'
- "*.md"
- ".*"

jobs:
build:
name: Build
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-2022]
qt_ver: [ 6.7.2 ]
qt_arch: [win64_msvc2019_64]
env:
version: 24.05.13
versionSuffix: ${{ !contains(github.ref_name,'master') && 'alpha' || 'NextNameHere' }}
prerelease: ${{ !contains(github.ref_name,'master') }}
steps:
- name: Install Qt
uses: jurplel/install-qt-action@v3
with:
version: ${{ matrix.qt_ver }}
# target: ${{ matrix.qt_target }}
arch: ${{ matrix.qt_arch }}
modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats qtspeech
setup-python: 'false'

- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: true

- name: Setup changelog
id: changelog
shell: bash
env:
prerelease: ${{env.prerelease}}
run: |
if [[ "$prerelease" == 'true' ]]
then
echo "This is a pre-release"
previousTag=$(git tag --sort=-creatordate | grep "^v" | sed -n 2p)
currentTag=$(git tag --sort=-creatordate | grep "^v" | sed -n 1p)
else
echo "This is not a pre-release"
previousTag=$(git tag --sort=-creatordate | grep "^v" | grep -v "alpha" | sed -n 2p)
currentTag=$(git tag --sort=-creatordate | grep "^v" | grep -v "alpha" | sed -n 1p)
fi
echo "prev_tag=$previousTag" >> $GITHUB_OUTPUT
echo "curr_tag=$currentTag" >> $GITHUB_OUTPUT
echo "previousTag : $previousTag"
echo "currentTag : $currentTag"
- name: "Build Changelog"
id: build_changelog
uses: mikepenz/release-changelog-builder-action@v3
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
commitMode: false
fromTag: "${{ steps.changelog.outputs.prev_tag }}"
toTag: "${{ steps.changelog.outputs.curr_tag }}"
configurationJson: |
{
"template": "#{{CHANGELOG}}\n\n<details>\n<summary>🔴 Uncategorized</summary>\n\n#{{UNCATEGORIZED}}\n</details>",
"categories": [
{
"title": "## 🚀 Features",
"labels": ["feature","feat","opt"]
},
{
"title": "## 🐛 Fixes",
"labels": ["fix","bug"]
}
,
{
"title": "## 🤖 Github action",
"labels": ["action"]
}
,
{
"title": "## 🧼 Clean Code",
"labels": ["clean"]
}
],
"label_extractor": [
{
"pattern": "([^:]*):.*",
"target": "$1",
"on_property": "title",
"flags": "gu"
}
]
}
- name: setup vcpkg github caches variables
uses: actions/github-script@v7
with:
script: |
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
- name: Build binaries
id: build
env:
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
run: |
# Launch-VsDevShell also provides Ninja
& 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\Launch-VsDevShell.ps1' `
-SkipAutomaticLocation -Arch amd64 -HostArch amd64
New-Item -Path './build_dir' -ItemType Directory
# RelWithDebInfo + msvc's = .pdb file beside program file.
cmake -S . -B "./build_dir" `
-G Ninja `
-DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe" `
-DCMAKE_BUILD_TYPE=RelWithDebInfo `
-DWITH_FFMPEG_PLAYER=OFF `
-DUSE_VCPKG=ON `
-DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake" `
-DWITH_VCPKG_BREAKPAD=ON
cmake --build "./build_dir"
- name: CPack create package
run: |
cd './build_dir'
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)"
$changeNotes = "
[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}}
"
$tagExist = gh api --silent "repos/:owner/:repo/git/refs/tags/${{github.ref_name}}"
if (-not $?) {
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
$namePrefix="GoldenDict-${{env.version}}-Qt${{matrix.qt_ver}}"
cd './build_dir'
gh release upload "${tagName}" "${namePrefix}.7z#${namePrefix}-Windows.7z" --clobber
gh release upload "${tagName}" "${namePrefix}.exe#${namePrefix}-Windows-installer.exe" --clobber
cd './goldendict'
gh release upload "${tagName}" "goldendict.exe#${namePrefix}-Windows-main-exe-file-only.exe" --clobber
gh release upload "${tagName}" "goldendict.pdb#${namePrefix}-Windows-debug-file.pdb" --clobber
cd ..
24 changes: 12 additions & 12 deletions .github/workflows/release-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
19 changes: 15 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 ()
Expand Down Expand Up @@ -353,12 +353,23 @@ if (WIN32)
PATTERN "*.ilk" EXCLUDE)


set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}-Qt${Qt6Widgets_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
set(CPACK_GENERATOR "7Z;NSIS")
set(CPACK_PACKAGE_FILE_NAME "GoldenDict-${PROJECT_VERSION}-Qt${Qt6Widgets_VERSION}")
set(CPACK_GENERATOR "7Z;NSIS64")

# override the default install path, which is $PROGRAMFILES64\${project-name} ${project-version} in NSIS
set(CPACK_PACKAGE_INSTALL_DIRECTORY "GoldenDict-ng")

# NSIS specificS
set(CPACK_NSIS_MANIFEST_DPI_AWARE ON)
set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/icons/programicon.ico")
set(CPACK_NSIS_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}")
set(CPACK_NSIS_DISPLAY_NAME "${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}")
set(CPACK_NSIS_URL_INFO_ABOUT [=[https://xiaoyifang.github.io/goldendict-ng/]=])
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
include(CPack)
set(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\GoldenDict-ng.lnk' '$INSTDIR\\\\${GOLDENDICT}.exe'")
set(CPACK_NSIS_DELETE_ICONS_EXTRA "Delete '$SMPROGRAMS\\\\$START_MENU\\\\GoldenDict-ng.lnk'")

include(CPack)
endif ()

feature_summary(WHAT ALL DESCRIPTION "Build configuration:")
8 changes: 4 additions & 4 deletions locale/ar_SA.ts
Original file line number Diff line number Diff line change
Expand Up @@ -580,19 +580,19 @@ between classic and school orthography in cyrillic)</source>
</message>
<message>
<source>Specify the maximum filtered headwords returned.</source>
<translation type="unfinished">Specify the maximum filtered headwords returned.</translation>
<translation>حدد الحد الأقصى للكلمات الرئيسية المصفاة التي تم إرجاعها.</translation>
</message>
<message>
<source>Filter max results:</source>
<translation type="unfinished">Filter max results:</translation>
<translation>تصفية النتائج الأقصى:</translation>
</message>
<message>
<source>Unique headwords total: %1.</source>
<translation type="unfinished">Unique headwords total: %1.</translation>
<translation>مجموع الكلمات الرئيسية الفريدة: %1.</translation>
</message>
<message>
<source>Unique headwords total: %1, filtered(limited): %2</source>
<translation type="unfinished">Unique headwords total: %1, filtered(limited): %2</translation>
<translation>مجموع الكلمات الرئيسية الفريدة: %1, filtered(محدود): %2</translation>
</message>
</context>
<context>
Expand Down
8 changes: 4 additions & 4 deletions locale/ay_BO.ts
Original file line number Diff line number Diff line change
Expand Up @@ -583,19 +583,19 @@ between classic and school orthography in cyrillic)</source>
</message>
<message>
<source>Specify the maximum filtered headwords returned.</source>
<translation type="unfinished">Specify the maximum filtered headwords returned.</translation>
<translation>Uñacht’ayaña jilpacha filtrado p’iqinchawinaka kutt’ayata.</translation>
</message>
<message>
<source>Filter max results:</source>
<translation type="unfinished">Filter max results:</translation>
<translation>Filtro max ukax akhamawa:</translation>
</message>
<message>
<source>Unique headwords total: %1.</source>
<translation type="unfinished">Unique headwords total: %1.</translation>
<translation>Jan uñt’at p’iqinchäwinak taqpachax: %1.</translation>
</message>
<message>
<source>Unique headwords total: %1, filtered(limited): %2</source>
<translation type="unfinished">Unique headwords total: %1, filtered(limited): %2</translation>
<translation>Sapa p’iqinchawi taqpacha: %1, filtrado(limitado): %2</translation>
</message>
</context>
<context>
Expand Down
8 changes: 4 additions & 4 deletions locale/be_BY.ts
Original file line number Diff line number Diff line change
Expand Up @@ -581,19 +581,19 @@ between classic and school orthography in cyrillic)</source>
</message>
<message>
<source>Specify the maximum filtered headwords returned.</source>
<translation type="unfinished">Specify the maximum filtered headwords returned.</translation>
<translation>Укажыце максімальную колькасць вернутых адфільтраваных загалоўных слоў.</translation>
</message>
<message>
<source>Filter max results:</source>
<translation type="unfinished">Filter max results:</translation>
<translation>Максімальныя вынікі фільтра:</translation>
</message>
<message>
<source>Unique headwords total: %1.</source>
<translation type="unfinished">Unique headwords total: %1.</translation>
<translation>Усяго унікальных загалоўных слоў: %1.</translation>
</message>
<message>
<source>Unique headwords total: %1, filtered(limited): %2</source>
<translation type="unfinished">Unique headwords total: %1, filtered(limited): %2</translation>
<translation>Усяго унікальных загалоўных слоў: %1, адфільтравана (абмежавана): %2</translation>
</message>
</context>
<context>
Expand Down
8 changes: 4 additions & 4 deletions locale/bg_BG.ts
Original file line number Diff line number Diff line change
Expand Up @@ -581,19 +581,19 @@ between classic and school orthography in cyrillic)</source>
</message>
<message>
<source>Specify the maximum filtered headwords returned.</source>
<translation type="unfinished">Specify the maximum filtered headwords returned.</translation>
<translation>Посочете максималния брой върнати филтрирани заглавни думи.</translation>
</message>
<message>
<source>Filter max results:</source>
<translation type="unfinished">Filter max results:</translation>
<translation>Филтриране на макс. резултати:</translation>
</message>
<message>
<source>Unique headwords total: %1.</source>
<translation type="unfinished">Unique headwords total: %1.</translation>
<translation>Общо уникални заглавни думи: %1.</translation>
</message>
<message>
<source>Unique headwords total: %1, filtered(limited): %2</source>
<translation type="unfinished">Unique headwords total: %1, filtered(limited): %2</translation>
<translation>Общо уникални заглавни думи: %1, филтрирано (ограничено): %2</translation>
</message>
</context>
<context>
Expand Down
Loading

0 comments on commit 174f902

Please sign in to comment.