diff options
| author | saturneric <[email protected]> | 2024-08-17 19:42:21 +0000 |
|---|---|---|
| committer | saturneric <[email protected]> | 2024-08-17 19:42:21 +0000 |
| commit | afd38aa9de1e075ab347a3ab3e99a08fd4b0d909 (patch) | |
| tree | d5561e8da40ca7ba52ab49cee299a74978f662b5 | |
| parent | fix: update README.md (diff) | |
| parent | feat: macos auto create dmg (diff) | |
| download | GpgFrontend-afd38aa9de1e075ab347a3ab3e99a08fd4b0d909.tar.gz GpgFrontend-afd38aa9de1e075ab347a3ab3e99a08fd4b0d909.zip | |
Merge branch 'dev/2.1.4/main'
| -rw-r--r-- | .github/workflows/release.yml | 4 | ||||
| -rw-r--r-- | resource/lfs/icns/GpgFrontend.icns | bin | 0 -> 649172 bytes | |||
| -rw-r--r-- | src/core/function/CacheManager.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e6542d4d..1cbe45d9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -82,6 +82,7 @@ jobs: run: | brew install cmake autoconf automake texinfo gettext openssl@3 brew install ninja libarchive gpgme googletest + brew install create-dmg brew link openssl@3 --force if: matrix.os == 'macos-13' || matrix.os == 'macos-12' || matrix.os == 'macos-14' @@ -244,8 +245,7 @@ jobs: hdiutil create ${{github.workspace}}/build/tmp.dmg -ov \ -volname "GpgFrontend" -fs HFS+ -srcfolder ${{github.workspace}}/build/package/ mkdir ${{github.workspace}}/build/final-artifact - hdiutil convert ${{github.workspace}}/build/tmp.dmg -format UDZO -o ${{github.workspace}}/build/final-artifact/GpgFrontend.dmg - codesign -s "${{secrets.GPGFRONTEND_XOCDE_CODE_SIGN_IDENTITY}}" ${{github.workspace}}/build/final-artifact/GpgFrontend.dmg + create-dmg --codesign "${{secrets.GPGFRONTEND_XOCDE_CODE_SIGN_IDENTITY}}" --volicon "${{github.workspace}}/resource/lfs/icns/GpgFrontend.icns" --volname GpgFrontend --app-drop-link 600 185 --window-size 800 400 ${{github.workspace}}/build/final-artifact/GpgFrontend.dmg ${{github.workspace}}/build/package/GpgFrontend.app mv ${{github.workspace}}/build/final-artifact/GpgFrontend.dmg \ ${{github.workspace}}/build/final-artifact/GpgFrontend-${{env.sha_short}}-x86_64.dmg mv ${{github.workspace}}/build/GpgFrontend.app.zip \ diff --git a/resource/lfs/icns/GpgFrontend.icns b/resource/lfs/icns/GpgFrontend.icns Binary files differnew file mode 100644 index 00000000..5732daf0 --- /dev/null +++ b/resource/lfs/icns/GpgFrontend.icns diff --git a/src/core/function/CacheManager.cpp b/src/core/function/CacheManager.cpp index 05138025..aed3a517 100644 --- a/src/core/function/CacheManager.cpp +++ b/src/core/function/CacheManager.cpp @@ -221,7 +221,7 @@ class CacheManager::Impl : public QObject { // get cache data list from file system QJsonArray registered_key_list; - if (stored_data->isArray()) { + if (stored_data.has_value() && stored_data->isArray()) { registered_key_list = stored_data->array(); } else { GpgFrontend::DataObjectOperator::GetInstance().SaveDataObj( |