Skip to content

Commit 67c972e

Browse files
committed
fix: slove ci issues
1 parent 23b3059 commit 67c972e

File tree

4 files changed

+19
-9
lines changed

4 files changed

+19
-9
lines changed

.github/workflows/release-qt5.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
- name: Build GpgME (Windows)
8484
shell: msys2 {0}
8585
run: |
86-
git clone --depth 1 --branch gpgme-1.22.0 git://git.gnupg.org/gpgme.git ${{github.workspace}}/third_party/gpgme
86+
git clone --depth 1 --branch gpgme-1.18.0 git://git.gnupg.org/gpgme.git ${{github.workspace}}/third_party/gpgme
8787
cd ${{github.workspace}}/third_party/gpgme
8888
./autogen.sh
8989
./configure --enable-maintainer-mode --enable-languages=cpp --disable-gpg-test && make -j4

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,18 +152,18 @@ jobs:
152152
git clone --depth 1 --branch gpgme-1.22.0 git://git.gnupg.org/gpgme.git ${{github.workspace}}/third_party/gpgme
153153
cd ${{github.workspace}}/third_party/gpgme
154154
./autogen.sh
155-
./configure --enable-maintainer-mode --enable-languages=cpp --disable-gpg-test && make -j4
155+
./configure --enable-maintainer-mode --enable-languages=cpp && make -j4
156156
sudo make install
157157
cd ${{github.workspace}}
158158
if: matrix.os == 'ubuntu-20.04'
159159

160160
- name: Build GpgME (Windows)
161161
shell: msys2 {0}
162162
run: |
163-
git clone --depth 1 --branch gpgme-1.22.0 git://git.gnupg.org/gpgme.git ${{github.workspace}}/third_party/gpgme
163+
git clone --depth 1 --branch gpgme-1.18.0 git://git.gnupg.org/gpgme.git ${{github.workspace}}/third_party/gpgme
164164
cd ${{github.workspace}}/third_party/gpgme
165165
./autogen.sh
166-
./configure --enable-maintainer-mode --enable-languages=cpp && make -j4
166+
./configure --enable-maintainer-mode --enable-languages=cpp --disable-gpg-test && make -j4
167167
make install
168168
cd ${{github.workspace}}
169169
if: matrix.os == 'windows-2019'

src/CMakeLists.txt

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ if (BUILD_APPLICATION)
179179
list(APPEND ALL_RUNTIME_DEP_PATH_LIST ${_libDllPath})
180180

181181
unset(_libDllPath)
182-
file(GLOB _libDllPath "${_libDllBinPath}/libassuan-*.dll")
182+
file(GLOB _libDllPath "${_libDllBinPath}/libassuan*.dll")
183183
list(APPEND ALL_RUNTIME_DEP_PATH_LIST ${_libDllPath})
184184

185185
unset(_libDllPath)
@@ -207,11 +207,11 @@ if (BUILD_APPLICATION)
207207
list(APPEND ALL_RUNTIME_DEP_PATH_LIST ${_libDllPath})
208208

209209
unset(_libDllPath)
210-
file(GLOB _libDllPath "${_libDllBinPath}/libgpg-error-*.dll")
210+
file(GLOB _libDllPath "${_libDllBinPath}/libgpg-error*.dll")
211211
list(APPEND ALL_RUNTIME_DEP_PATH_LIST ${_libDllPath})
212212

213213
unset(_libDllPath)
214-
file(GLOB _libDllPath "${_libDllBinPath}/libgpgme-*.dll")
214+
file(GLOB _libDllPath "${_libDllBinPath}/libgpgme*.dll")
215215
list(APPEND ALL_RUNTIME_DEP_PATH_LIST ${_libDllPath})
216216

217217
unset(_libDllPath)
@@ -279,9 +279,20 @@ if (BUILD_APPLICATION)
279279
file(GLOB _libDllPath "${_libDllBinPath}/libxml2-*.dll")
280280
list(APPEND ALL_RUNTIME_DEP_PATH_LIST ${_libDllPath})
281281

282+
# /mingw64/libexec
283+
execute_process(
284+
COMMAND cygpath -m /mingw64/libexec
285+
OUTPUT_VARIABLE MSYS64_LIBEXEC_PATH
286+
OUTPUT_STRIP_TRAILING_WHITESPACE
287+
)
288+
282289
# gpgme-w32spawn.exe
283290
unset(_libExEPath)
284-
file(GLOB _libExEPath "${_libDllBinPath}/gpgme-w32spawn.exe")
291+
file(GLOB _libExEPath "${MSYS64_LIBEXEC_PATH}/gpgme-*.exe")
292+
list(APPEND ALL_RUNTIME_DEP_PATH_LIST ${_libExEPath})
293+
294+
unset(_libExEPath)
295+
file(GLOB _libExEPath "${_libDllBinPath}/gpgme-*.exe")
285296
list(APPEND ALL_RUNTIME_DEP_PATH_LIST ${_libExEPath})
286297

287298
set(ALL_RUNTIME_DLL_FILES "")

src/core/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ if(MINGW)
8282
)
8383
endif()
8484

85-
8685
# configure libarchive
8786
if(NOT MINGW)
8887
if(APPLE)

0 commit comments

Comments
 (0)