Update tested Qt versions (#126)

maplibre · Apr 26, 2024 · adb5665 · adb5665
1 parent c7fbde1
commit adb5665
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 24 deletions.
diff --git a/.github/workflows/Android.yml b/.github/workflows/Android.yml
@@ -56,18 +56,30 @@ jobs:
           - qt_version: 6.5.3
             abi: arm64-v8a
             arch: android_arm64_v8a
-          - qt_version: 6.6.2
+          - qt_version: 6.6.3
             abi: x86
             arch: android_x86
-          - qt_version: 6.6.2
+          - qt_version: 6.6.3
             abi: x86_64
             arch: android_x86_64
-          - qt_version: 6.6.2
+          - qt_version: 6.6.3
             abi: armeabi-v7a
             arch: android_armv7
-          - qt_version: 6.6.2
+          - qt_version: 6.6.3
             abi: arm64-v8a
             arch: android_arm64_v8a
+          # - qt_version: 6.7.0
+          #   abi: x86
+          #   arch: android_x86
+          # - qt_version: 6.7.0
+          #   abi: x86_64
+          #   arch: android_x86_64
+          # - qt_version: 6.7.0
+          #   abi: armeabi-v7a
+          #   arch: android_armv7
+          # - qt_version: 6.7.0
+          #   abi: arm64-v8a
+          #   arch: android_arm64_v8a
 
     steps:
       - name: Checkout
@@ -85,7 +97,6 @@ jobs:
           version: ${{ matrix.qt_version }}
           modules: qtlocation qtpositioning
           set-env: false
-          extra: --base https://mirrors.ocf.berkeley.edu/qt/
 
       - name: Download Qt (Android)
         id: qt-android
@@ -96,7 +107,6 @@ jobs:
           target: android
           arch: ${{ matrix.arch }}
           modules: qtlocation qtpositioning
-          extra: --base https://mirrors.ocf.berkeley.edu/qt/
 
       - name: Fix Qt release
         if: ${{ matrix.abi }} == 'armeabi-v7a'
@@ -139,7 +149,7 @@ jobs:
     needs: build
     strategy:
       matrix:
-        qt_version: [6.5.3, 6.6.2]
+        qt_version: [6.5.3, 6.6.3]
 
     steps:
       - name: Download artifacts for x86
@@ -209,7 +219,7 @@ jobs:
       contents: write
     strategy:
       matrix:
-        qt_version: [6.5.3, 6.6.2]
+        qt_version: [6.5.3, 6.6.3]
 
     steps:
       - name: Download artifacts

diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml
@@ -53,12 +53,17 @@ jobs:
             preset: Linux-CI
             compiler: default
           - qt_series: 6
-            qt_version: 6.6.2
+            qt_version: 6.6.3
             qt_modules: qtlocation qtpositioning
             preset: Linux-CI
             compiler: default
           - qt_series: 6
-            qt_version: 6.6.2
+            qt_version: 6.7.0
+            qt_modules: qtlocation qtpositioning
+            preset: Linux-CI
+            compiler: default
+          - qt_series: 6
+            qt_version: 6.7.0
             qt_modules: qtlocation qtpositioning
             preset: Linux-coverage
             compiler: gcc-13
@@ -130,7 +135,6 @@ jobs:
           dir: ${{ github.workspace }}
           target: desktop
           modules: ${{ matrix.qt_modules }}
-          extra: --base https://mirrors.ocf.berkeley.edu/qt/
 
       - name: Setup ninja
         if: matrix.compiler != 'default'
@@ -219,7 +223,7 @@ jobs:
       contents: write
     strategy:
       matrix:
-        qt_version: [5.15.2, 6.5.3, 6.6.2]
+        qt_version: [5.15.2, 6.5.3, 6.6.3, 6.7.0]
 
     steps:
       - name: Download artifacts

diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml
@@ -64,7 +64,15 @@ jobs:
             compiler_version: 14.29
             preset: Windows-ccache
           - qt_series: 6
-            qt_version: 6.6.2
+            qt_version: 6.6.3
+            qt_arch: win64_msvc2019_64
+            qt_modules: qtlocation qtpositioning
+            arch: msvc2019_64
+            compiler: x64
+            compiler_version: 14.29
+            preset: Windows-ccache
+          - qt_series: 6
+            qt_version: 6.7.0
             qt_arch: win64_msvc2019_64
             qt_modules: qtlocation qtpositioning
             arch: msvc2019_64
@@ -98,7 +106,6 @@ jobs:
           target: desktop
           arch: ${{ matrix.qt_arch }}
           modules: ${{ matrix.qt_modules }}
-          extra: --base https://mirrors.ocf.berkeley.edu/qt/
 
       - name: Setup ninja
         uses: seanmiddleditch/gha-setup-ninja@v4
@@ -173,7 +180,7 @@ jobs:
       contents: write
     strategy:
       matrix:
-        qt_version: [5.15.2, 6.5.3, 6.6.2]
+        qt_version: [5.15.2, 6.5.3, 6.6.3, 6.7.0]
         arch: [msvc2019_64]
 
     steps:

diff --git a/.github/workflows/iOS.yml b/.github/workflows/iOS.yml
@@ -46,7 +46,9 @@ jobs:
         include:
           - qt_version: 6.5.3
             preset: iOS-ccache
-          - qt_version: 6.6.2
+          - qt_version: 6.6.3
+            preset: iOS-ccache
+          - qt_version: 6.7.0
             preset: iOS-ccache
 
     env:
@@ -73,7 +75,6 @@ jobs:
           target: desktop
           modules: qtlocation qtpositioning
           set-env: false
-          extra: --base https://mirrors.ocf.berkeley.edu/qt/
 
       - name: Download Qt (iOS)
         uses: jurplel/install-qt-action@v3
@@ -82,7 +83,6 @@ jobs:
           version: ${{ matrix.qt_version }}
           target: ios
           modules: qtlocation qtpositioning
-          extra: --base https://mirrors.ocf.berkeley.edu/qt/
 
       - name: Setup ninja
         uses: seanmiddleditch/gha-setup-ninja@v4
@@ -114,7 +114,7 @@ jobs:
       contents: write
     strategy:
       matrix:
-        qt_version: [6.5.3, 6.6.2]
+        qt_version: [6.5.3, 6.6.3, 6.7.0]
 
     steps:
       - name: Download artifacts

diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml
@@ -57,16 +57,22 @@ jobs:
             compiler: default
             runs_on: macos-14
           - qt_series: 6
-            qt_version: 6.6.2
+            qt_version: 6.6.3
             qt_modules: qtlocation qtpositioning
             preset: macOS-ccache
             compiler: default
             runs_on: macos-14
           - qt_series: 6
-            qt_version: 6.6.2
+            qt_version: 6.7.0
+            qt_modules: qtlocation qtpositioning
+            preset: macOS-ccache
+            compiler: default
+            runs_on: macos-14
+          - qt_series: 6
+            qt_version: 6.7.0
             qt_modules: qtlocation qtpositioning
             preset: macOS-clang-tidy
-            compiler: llvm@17
+            compiler: llvm
             runs_on: macos-14
 
     env:
@@ -105,7 +111,6 @@ jobs:
           version: ${{ matrix.qt_version }}
           target: desktop
           modules: ${{ matrix.qt_modules }}
-          extra: --base https://mirrors.ocf.berkeley.edu/qt/
 
       - name: Setup ninja
         uses: seanmiddleditch/gha-setup-ninja@v4
@@ -164,7 +169,7 @@ jobs:
       contents: write
     strategy:
       matrix:
-        qt_version: [5.15.2, 6.5.3, 6.6.2]
+        qt_version: [5.15.2, 6.5.3, 6.6.3, 6.7.0]
 
     steps:
       - name: Download artifacts