Next round

.github/workflows/android.yml

@@ -23,15 +23,42 @@ jobs:
     - name: Set QT_HOST_PATH
       run: |
         echo QT_HOST_PATH=$Qt6_DIR >> $GITHUB_ENV
-    - name: Install Qt for Android
+    - name: Install Qt for Android arm64
       uses: jurplel/install-qt-action@v3
       with:
         cache: 'true'
         cache-key-prefix: 'install-qt-action-android'
         modules: 'qtlocation qtpositioning'
         target: 'android'
         version: '6.*.*'
-        arch: 'android_arm64_v8a;android_armv7;android_x86;android_x86_64'
+        arch: 'android_arm64_v8a'
+    - name: Install Qt for Android armv7
+      uses: jurplel/install-qt-action@v3
+      with:
+        cache: 'true'
+        cache-key-prefix: 'install-qt-action-android'
+        modules: 'qtlocation qtpositioning'
+        target: 'android'
+        version: '6.*.*'
+        arch: 'android_armv7'
+    - name: Install Qt for Android x86
+      uses: jurplel/install-qt-action@v3
+      with:
+        cache: 'true'
+        cache-key-prefix: 'install-qt-action-android'
+        modules: 'qtlocation qtpositioning'
+        target: 'android'
+        version: '6.*.*'
+        arch: 'android_x86'
+    - name: Install Qt for Android x86_64
+      uses: jurplel/install-qt-action@v3
+      with:
+        cache: 'true'
+        cache-key-prefix: 'install-qt-action-android'
+        modules: 'qtlocation qtpositioning'
+        target: 'android'
+        version: '6.*.*'
+        arch: 'android_x86_64'
     - name: Install Additional Software
       run: |
         sudo apt install ninja-build

.github/workflows/macos.yml

@@ -1,4 +1,4 @@
-name: Compile on Linux
+name: Compile on macOS
 
 on:
   push:
@@ -22,7 +22,7 @@ jobs:
         version: '6.*.*'
     - name: Install Additional Software
       run: |
-        sudo apt install ninja-build
+        brew install ninja
     - name: ccache
       uses: hendrikmuhs/[email protected]
       with:

.github/workflows/windows.yml

@@ -0,0 +1,40 @@
+name: Compile on Windows
+
+on:
+  push:
+    branches: [ main ]
+
+jobs:
+  build:
+
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v3
+      with:
+        cache: 'true'
+        modules: 'qtlocation qtpositioning'
+        version: '6.*.*'
+    - name: Install Additional Software
+      run: |
+        sudo apt install ninja-build
+    - name: ccache
+      uses: hendrikmuhs/[email protected]
+      with:
+        key: linux
+    - name: Compile and Install
+      run: |
+        Qt6_DIR_BASE=$(dirname "$Qt6_DIR") ./buildscript-windows.bat
+    - name: Package
+      run: |
+        powershell Compress-Archive Qt enrouteDependencies_windows64.zip
+    - name: Upload to developerBuilds
+      run: |
+        gh release upload --clobber developerBuilds enrouteDependencies_windows64.zip
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitmodules

@@ -9,4 +9,4 @@
 	url = https://github.com/madler/zlib.git
 [submodule "bzip2"]
 	path = bzip2
-	url = https://gitlab.com/bzip2/bzip2.git
+	url = https://github.com/libarchive/bzip2.git

buildscript-windows.bat

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Fail on first error
+set -e
+
+installDir=Qt/$(basename "$Qt6_DIR_BASE")/msvc2019_64
+
+echo
+echo "Windows Desktop"
+
+$Qt6_DIR_BASE/msvc2019_64/bin/qt-cmake \
+    -S maplibre-native-qt \
+    -B build-maplibre-native-qt-windows \
+    -G Ninja \
+    -DBUILD_TESTING=OFF \
+    -DCMAKE_C_COMPILER_LAUNCHER="ccache" \
+    -DCMAKE_CXX_COMPILER_LAUNCHER="ccache" \
+    -DCMAKE_PREFIX_PATH=$Qt6_DIR_BASE/msvc2019_64 \
+    -DCMAKE_INSTALL_PREFIX=$installDir
+cmake --build build-maplibre-native-qt-windows
+cmake --install build-maplibre-native-qt-windows