fix: solve windows build issues and switch to latest qt version as well

2 files changed, 21 insertions, 12 deletions

diff --git a/.github/workflows/release-qt5.yml b/.github/workflows/release-qt5.yml
index ae8b857c..196d7480 100644
--- a/.github/workflows/release-qt5.yml
+++ b/.github/workflows/release-qt5.yml
@@ -163,18 +163,33 @@ jobs:
           wget -c -nv https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
           chmod u+x linuxdeployqt-continuous-x86_64.AppImage
           ./linuxdeployqt-continuous-x86_64.AppImage ${{github.workspace}}/build/artifacts/AppDir/usr/share/applications/*.desktop -no-translations -extra-plugins=iconengines -appimage
+          echo "BUILD_TYPE_LOWER=${BUILD_TYPE,,}" >> ${GITHUB_ENV}
+          echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> ${GITHUB_ENV}
         if: matrix.os == 'ubuntu-20.04'
+
+
+      - name: Copy Modules & Package (Windows)
+        shell: msys2 {0}
+        run: |
+          cd $(echo "/${{github.workspace}}"  | sed 's/\\/\//g' | sed 's/://')
+          mkdir -p build/artifacts/modules
+          cp -r modules/build/artifacts/* build/artifacts/modules
+          cd build
+          windeployqt-qt6 --force ./artifacts/GpgFrontend.exe
+          echo "BUILD_TYPE_LOWER=${BUILD_TYPE,,}" >> ${GITHUB_ENV}
+          echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> ${GITHUB_ENV}
+        if: matrix.os == 'windows-2019'
       
       - name: Upload Artifact(Linux)
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@v4
         with:
-          name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{ github.sha }}
+          name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE_LOWER}}-${{ env.SHORT_SHA }}
           path: ${{github.workspace}}/build/final-artifact/Gpg_Frontend*.AppImage*
         if: matrix.os == 'ubuntu-20.04'
 
       - name: Upload Artifact(Windows)
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@v4
         with:
-          name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{ github.sha }}
+          name: gpgfrontend-${{matrix.os}}--${{env.BUILD_TYPE_LOWER}}-${{ env.SHORT_SHA }}
           path: ${{github.workspace}}/build/artifacts/*
         if: matrix.os == 'windows-2019'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 783f5b83..46af6e4b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -100,14 +100,8 @@ jobs:
         run: |
           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 automake 
-          pacman --noconfirm -S --needed libintl msys2-runtime-devel gettext-devel
+          pacman --noconfirm -S --needed mingw-w64-x86_64-qt6 mingw-w64-x86_64-icu libintl msys2-runtime-devel gettext-devel
           pacman --noconfirm -S --needed mingw-w64-x86_64-ninja mingw-w64-x86_64-gnupg mingw-w64-x86_64-libarchive
-          wget https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-icu-73.2-1-any.pkg.tar.zst
-          wget https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-qt6-base-6.5.3-1-any.pkg.tar.zst
-          wget https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-qt6-5compat-6.5.3-1-any.pkg.tar.zst
-          wget https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-qt6-svg-6.5.3-1-any.pkg.tar.zst
-          wget https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-qt6-tools-6.5.3-1-any.pkg.tar.zst
-          pacman --noconfirm -U *.pkg.tar.zst
         if: matrix.os == 'windows-2019'
 
       - name: Build gpg-error (Linux)
@@ -294,7 +288,7 @@ jobs:
           mkdir -p build/artifacts/modules
           cp -r modules/build/artifacts/* build/artifacts/modules
           cd build
-          windeployqt-qt6 --force --libdir ./artifacts --release ./artifacts/GpgFrontend.exe
+          windeployqt-qt6 --force ./artifacts/GpgFrontend.exe
         if: matrix.os == 'windows-2019'
 
       - name: Upload Artifact (Linux)