CI: Updated builds to Qt 6.8

Removed downloading of OpenSSL since version 1.1.1 is no longer available. We don't need a more recent version due to using the schannel backend since Qt 6.2. Also updated the Windows builds to MinGW 13.1.0, matching this version of Qt.
bjorn · Oct 24, 2024 · 37a8d1a · 37a8d1a
1 parent c84083d
commit 37a8d1a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml
@@ -48,7 +48,7 @@ jobs:
         include:
         - qt_version: 5.15.2
           qt_version_major: 5
-        - qt_version: 6.7.3
+        - qt_version: 6.8.0
           qt_version_major: 6
 
     env:
@@ -194,7 +194,7 @@ jobs:
         - qt_version: 5.12.12
           version_suffix: "10.12-10.15"
           architectures: x86_64
-        - qt_version: 6.7.3
+        - qt_version: 6.8.0
           version_suffix: "11+"
           architectures: x86_64,arm64
 
@@ -287,20 +287,19 @@ jobs:
           mingw_version: 8.1.0
           mingw_component: mingw
           mingw_path: /c/Qt/Tools/mingw810_32/bin
-        - qt_version: 6.7.3
+        - qt_version: 6.8.0
           qt_version_major: 6
           qt_toolchain: win64_mingw
           arch: 64
           openssl_arch: x64
           filename_suffix: 'Windows-10+_x86_64'
-          mingw_version: 9.0.0
-          mingw_component: mingw90
-          mingw_path: /c/Qt/Tools/mingw1120_64/bin
+          mingw_version: 13.1.0
+          mingw_component: mingw1310
+          mingw_path: /c/Qt/Tools/mingw1310_64/bin
 
     env:
       TILED_VERSION: ${{ needs.version.outputs.version }}
       MINGW_PATH: ${{ matrix.mingw_path }}
-      OPENSSL_VERSION: 1.1.1
 
     defaults:
       run:
@@ -314,7 +313,6 @@ jobs:
       run: |
         echo "QT_PATH=$(./dist/install-qt.sh --version ${{ matrix.qt_version }} --toolchain ${{ matrix.qt_toolchain }} qtbase qtdeclarative qtsvg qtimageformats qttools qttranslations)" >> $GITHUB_ENV
         ./dist/install-qt.sh --version ${{ matrix.mingw_version }} --toolchain win${{ matrix.arch }}_mingw ${{ matrix.mingw_component }}
-        echo "OPENSSL_PATH=$(./dist/install-qt.sh --version ${OPENSSL_VERSION} openssl --arch ${{ matrix.openssl_arch }})" >> $GITHUB_ENV
 
     - name: Install Qbs
       run: |

diff --git a/dist/win/installer.qbs b/dist/win/installer.qbs
@@ -59,13 +59,16 @@ WindowsInstallerPackage {
         if (rpMapEnabled)
             defs.push("RpMap");
 
-        if (project.openSslPath) {
-            defs.push("OpenSsl111Dir=" + project.openSslPath);
-        } else {
-            var bits = (qbs.architecture === "x86_64") ? "64" : "32;"
-            var openSslDir = "C:\\OpenSSL-v111-Win" + bits
-            if (File.exists(openSslDir))
-                defs.push("OpenSsl111Dir=" + openSslDir);
+        // Since Qt 6.2 we rely on the schannel backend.
+        if (Qt.core.versionMajor < 6 || Qt.core.versionMinor < 2) {
+            if (project.openSslPath) {
+                defs.push("OpenSsl111Dir=" + project.openSslPath);
+            } else {
+                var bits = (qbs.architecture === "x86_64") ? "64" : "32;"
+                var openSslDir = "C:\\OpenSSL-v111-Win" + bits
+                if (File.exists(openSslDir))
+                    defs.push("OpenSsl111Dir=" + openSslDir);
+            }
         }
 
         return defs;

diff --git a/dist/win/installer.wxs b/dist/win/installer.wxs
@@ -117,11 +117,6 @@
             <!-- OpenSSL is needed for Qt versions older than 6.2,
                  otherwise rely on the schannel backend -->
             <?if $(var.QtVersionMajor) < 6 or $(var.QtVersionMinor) < 2 ?>
-              <?ifdef OpenSsl102Dir ?>
-                <File Source="$(var.OpenSsl102Dir)\libeay32.dll" />
-                <File Source="$(var.OpenSsl102Dir)\ssleay32.dll" />
-              <?endif?>
-
               <?ifdef OpenSsl111Dir ?>
                 <?if $(var.Platform) = x64 ?>
                   <File Source="$(var.OpenSsl111Dir)\libcrypto-1_1-x64.dll" />
@@ -131,6 +126,11 @@
                   <File Source="$(var.OpenSsl111Dir)\libssl-1_1.dll" />
                 <?endif?>
               <?endif?>
+
+              <?ifdef OpenSslv3Dir ?>
+                <File Source="$(var.OpenSslv3Dir)\libcrypto-3-x64.dll" />
+                <File Source="$(var.OpenSslv3Dir)\libssl-3-x64.dll" />
+              <?endif?>
             <?endif?>
 
             <File Name="COPYING.txt" Source="$(var.RootDir)\COPYING"/>