diff options
| author | saturneric <[email protected]> | 2024-02-01 07:43:02 +0000 |
|---|---|---|
| committer | saturneric <[email protected]> | 2024-02-01 12:17:17 +0000 |
| commit | 67c972ee914974098613273da76298c8be4b8151 (patch) | |
| tree | 4384fe2f5357d44e65319b294180c87e0769cfb5 | |
| parent | chore: speed up ci (diff) | |
| download | GpgFrontend-67c972ee914974098613273da76298c8be4b8151.tar.gz GpgFrontend-67c972ee914974098613273da76298c8be4b8151.zip | |
fix: slove ci issues
| -rw-r--r-- | .github/workflows/release-qt5.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 6 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 19 | ||||
| -rw-r--r-- | src/core/CMakeLists.txt | 1 |
4 files changed, 19 insertions, 9 deletions
diff --git a/.github/workflows/release-qt5.yml b/.github/workflows/release-qt5.yml index a3cc7f12..74ffc61e 100644 --- a/.github/workflows/release-qt5.yml +++ b/.github/workflows/release-qt5.yml @@ -83,7 +83,7 @@ jobs: - name: Build GpgME (Windows) shell: msys2 {0} run: | - git clone --depth 1 --branch gpgme-1.22.0 git://git.gnupg.org/gpgme.git ${{github.workspace}}/third_party/gpgme + git clone --depth 1 --branch gpgme-1.18.0 git://git.gnupg.org/gpgme.git ${{github.workspace}}/third_party/gpgme cd ${{github.workspace}}/third_party/gpgme ./autogen.sh ./configure --enable-maintainer-mode --enable-languages=cpp --disable-gpg-test && make -j4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c7cb5085..0d3d52df 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -152,7 +152,7 @@ jobs: git clone --depth 1 --branch gpgme-1.22.0 git://git.gnupg.org/gpgme.git ${{github.workspace}}/third_party/gpgme cd ${{github.workspace}}/third_party/gpgme ./autogen.sh - ./configure --enable-maintainer-mode --enable-languages=cpp --disable-gpg-test && make -j4 + ./configure --enable-maintainer-mode --enable-languages=cpp && make -j4 sudo make install cd ${{github.workspace}} if: matrix.os == 'ubuntu-20.04' @@ -160,10 +160,10 @@ jobs: - name: Build GpgME (Windows) shell: msys2 {0} run: | - git clone --depth 1 --branch gpgme-1.22.0 git://git.gnupg.org/gpgme.git ${{github.workspace}}/third_party/gpgme + git clone --depth 1 --branch gpgme-1.18.0 git://git.gnupg.org/gpgme.git ${{github.workspace}}/third_party/gpgme cd ${{github.workspace}}/third_party/gpgme ./autogen.sh - ./configure --enable-maintainer-mode --enable-languages=cpp && make -j4 + ./configure --enable-maintainer-mode --enable-languages=cpp --disable-gpg-test && make -j4 make install cd ${{github.workspace}} if: matrix.os == 'windows-2019' diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e47e2bae..8fa51056 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -179,7 +179,7 @@ if (BUILD_APPLICATION) list(APPEND ALL_RUNTIME_DEP_PATH_LIST ${_libDllPath}) unset(_libDllPath) - file(GLOB _libDllPath "${_libDllBinPath}/libassuan-*.dll") + file(GLOB _libDllPath "${_libDllBinPath}/libassuan*.dll") list(APPEND ALL_RUNTIME_DEP_PATH_LIST ${_libDllPath}) unset(_libDllPath) @@ -207,11 +207,11 @@ if (BUILD_APPLICATION) list(APPEND ALL_RUNTIME_DEP_PATH_LIST ${_libDllPath}) unset(_libDllPath) - file(GLOB _libDllPath "${_libDllBinPath}/libgpg-error-*.dll") + file(GLOB _libDllPath "${_libDllBinPath}/libgpg-error*.dll") list(APPEND ALL_RUNTIME_DEP_PATH_LIST ${_libDllPath}) unset(_libDllPath) - file(GLOB _libDllPath "${_libDllBinPath}/libgpgme-*.dll") + file(GLOB _libDllPath "${_libDllBinPath}/libgpgme*.dll") list(APPEND ALL_RUNTIME_DEP_PATH_LIST ${_libDllPath}) unset(_libDllPath) @@ -279,9 +279,20 @@ if (BUILD_APPLICATION) file(GLOB _libDllPath "${_libDllBinPath}/libxml2-*.dll") list(APPEND ALL_RUNTIME_DEP_PATH_LIST ${_libDllPath}) + # /mingw64/libexec + execute_process( + COMMAND cygpath -m /mingw64/libexec + OUTPUT_VARIABLE MSYS64_LIBEXEC_PATH + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + # gpgme-w32spawn.exe unset(_libExEPath) - file(GLOB _libExEPath "${_libDllBinPath}/gpgme-w32spawn.exe") + file(GLOB _libExEPath "${MSYS64_LIBEXEC_PATH}/gpgme-*.exe") + list(APPEND ALL_RUNTIME_DEP_PATH_LIST ${_libExEPath}) + + unset(_libExEPath) + file(GLOB _libExEPath "${_libDllBinPath}/gpgme-*.exe") list(APPEND ALL_RUNTIME_DEP_PATH_LIST ${_libExEPath}) set(ALL_RUNTIME_DLL_FILES "") diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index bf64d15a..cc1f6742 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -82,7 +82,6 @@ if(MINGW) ) endif() - # configure libarchive if(NOT MINGW) if(APPLE) |