<fix>(ci): Independent compilation of gpgme under windows

3 files changed, 20 insertions, 33 deletions

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 31a0dfa0..8c123189 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -75,36 +75,6 @@ jobs:
         with:
           cached: ${{ steps.cache-qt.outputs.cache-hit }}
 
-      - name: Build gpg-error (Linux)
-        run: |
-          cd  ${{github.workspace}}/..
-          git clone https://github.com/saturneric/libgpg-error
-          cd libgpg-error
-          ./autogen.sh
-          ./configure --enable-maintainer-mode --enable-static=yes && make -j2
-          sudo make install
-          cd ${{github.workspace}}
-
-      - name: Build assuan (Linux)
-        run: |
-          cd  ${{github.workspace}}/..
-          git clone https://github.com/saturneric/libassuan
-          cd libassuan
-          ./autogen.sh
-          ./configure --enable-maintainer-mode --enable-static=yes && make -j2
-          sudo make install
-          cd ${{github.workspace}}
-
-      - name: Build GpgME (Linux)
-        run: |
-          cd  ${{github.workspace}}/..
-          git clone https://github.com/saturneric/gpgme
-          cd gpgme
-          ./autogen.sh
-          ./configure --enable-maintainer-mode --enable-static=yes --enable-languages=cpp && make -j2
-          sudo make install
-          cd ${{github.workspace}}
-
       - name: Configure CMake
         # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
         # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
index 0030dea8..4ee104b1 100644
--- a/.github/workflows/debug.yml
+++ b/.github/workflows/debug.yml
@@ -90,10 +90,19 @@ jobs:
           pacman --noconfirm -S --needed mingw-w64-x86_64-gcc mingw-w64-x86_64-make mingw-w64-x86_64-cmake autoconf
           pacman --noconfirm -S --needed make texinfo mingw-w64-x86_64-libconfig mingw-w64-x86_64-boost automake
           pacman --noconfirm -S --needed mingw-w64-x86_64-qt5 libintl msys2-runtime-devel gettext-devel
-          pacman --noconfirm -S --needed mingw-w64-x86_64-gpgme mingw-w64-x86_64-ninja mingw-w64-x86_64-gnupg
+          pacman --noconfirm -S --needed mingw-w64-x86_64-ninja mingw-w64-x86_64-gnupg
           pacman --noconfirm -S --needed mingw-w64-x86_64-libarchive
         if: matrix.os == 'windows-latest'
 
+      - name: Build GpgME (Windows)
+        shell: msys2 {0}
+        run: |
+          cd ${{github.workspace}}/third_party/gpgme
+          ./autogen.sh
+          ./configure --enable-maintainer-mode --enable-static=yes --disable-gpg-test --enable-languages=cpp LDFLAGS="-static" && make -j2
+          make install
+        if: matrix.os == 'windows-latest'
+
       - name: Build GpgFrontend (Linux)
         # Build your GpgFrontend with the given configuration
         run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 850ead21..52d53dcd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -98,8 +98,16 @@ jobs:
           pacman --noconfirm -S --needed mingw-w64-x86_64-gcc mingw-w64-x86_64-make mingw-w64-x86_64-cmake autoconf 
           pacman --noconfirm -S --needed make texinfo mingw-w64-x86_64-libconfig mingw-w64-x86_64-boost automake 
           pacman --noconfirm -S --needed mingw-w64-x86_64-qt5 libintl msys2-runtime-devel gettext-devel
-          pacman --noconfirm -S --needed mingw-w64-x86_64-gpgme mingw-w64-x86_64-ninja mingw-w64-x86_64-gnupg
-          pacman --noconfirm -S --needed mingw-w64-x86_64-libarchive
+          pacman --noconfirm -S --needed mingw-w64-x86_64-ninja mingw-w64-x86_64-gnupg mingw-w64-x86_64-libarchive
+        if: matrix.os == 'windows-2019'
+
+      - name: Build GpgME (Windows)
+        shell: msys2 {0}
+        run: |
+          cd ${{github.workspace}}/third_party/gpgme
+          ./autogen.sh
+          ./configure --enable-maintainer-mode --enable-static=yes --disable-gpg-test --enable-languages=cpp LDFLAGS="-static" && make -j2
+          make install
         if: matrix.os == 'windows-2019'
 
       - name: Build GpgFrontend (Linux)