Next round

Akaflieg-Freiburg · Dec 7, 2023 · a2c6859 · a2c6859
1 parent 1822638
commit a2c6859
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 37 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -32,33 +32,6 @@ jobs:
         target: 'android'
         version: '6.*.*'
         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
@@ -72,12 +45,39 @@ jobs:
       uses: hendrikmuhs/[email protected]
       with:
         key: android
-    - name: Compile and Install
+    - name: Compile and Install libzip
+      run: |
+        $Qt6_DIR/bin/qt-cmake \
+    	  -G Ninja  \
+	      -S libzip \
+    	  -B build-libzip \
+	      -DBUILD_DOC=OFF \
+    	  -DBUILD_EXAMPLES=OFF \
+	      -DBUILD_REGRESS=OFF \
+    	  -DBUILD_SHARED_LIBS=OFF \
+	      -DBUILD_TOOLS=OFF \
+    	  -DENABLE_BZIP2=OFF \
+	      -DENABLE_LZMA=OFF \
+    	  -DENABLE_ZSTD=OFF \
+    	  -DCMAKE_INSTALL_PREFIX=Qt
+	      cmake --build build-libzip
+        cmake --install build-libzip
+    - name: Compile and Install maplibre-native-qt
       run: |
-        Qt6_DIR_BASE=$(dirname "$Qt6_DIR") ./buildscript-android.sh
+        $Qt6_DIR/bin/qt-cmake \
+		    -S maplibre-native-qt \
+        -B build-maplibre-native-qt \
+        -G Ninja \
+        -DBUILD_TESTING=OFF \
+        -DCMAKE_C_COMPILER_LAUNCHER="ccache" \
+        -DCMAKE_CXX_COMPILER_LAUNCHER="ccache" \
+        -DCMAKE_PREFIX_PATH=$Qt6_DIR \
+        -DCMAKE_INSTALL_PREFIX=Qt
+        cmake --build build-maplibre-native-qt
+        cmake --install build-maplibre-native-qt
     - name: Package
       run: |
-        tar cvfz enrouteDependencies_android.tar.gz Qt
+        tar cvfz enrouteDependencies_android_arm64.tar.gz Qt
     - name: Upload to developerBuilds
       run: |
         gh release upload --clobber developerBuilds *.tar.gz

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -1,4 +1,4 @@
-name: Compile on ios
+name: Compile on iOS
 
 on:
   push:
@@ -19,7 +19,7 @@ jobs:
       with:
         cache: 'true'
         cache-key-prefix: 'install-qt-action-macOS-host'
-        version: '6.5.2'
+        version: '6.*.*'
     - name: Set QT_HOST_PATH
       run: |
         echo QT_HOST_PATH=$Qt6_DIR >> $GITHUB_ENV
@@ -29,7 +29,7 @@ jobs:
         cache: 'true'
         cache-key-prefix: 'install-qt-action-ios'
         target: 'ios'
-        version: '6.5.2'
+        version: '6.*.*'
     - name: Install software
       run: |
         brew install ninja

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -2,7 +2,7 @@ name: Compile on macOS
 
 on:
   push:
-    branches: [ feature/actions ]
+    branches: [ main ]
 
 jobs:
   build:

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -2,7 +2,7 @@ name: Compile on Windows
 
 on:
   push:
-    branches: [ main ]
+    branches: [ feature/actions ]
 
 jobs:
   build:
@@ -27,9 +27,36 @@ jobs:
       uses: hendrikmuhs/[email protected]
       with:
         key: linux
-    - name: Compile and Install
+    - name: Compile and Install libzip
       run: |
-        Qt6_DIR_BASE=$(dirname "$Qt6_DIR") ./buildscript-windows.bat
+        qt-cmake \
+    	  -G Ninja  \
+	      -S libzip \
+    	  -B build-libzip \
+	      -DBUILD_DOC=OFF \
+    	  -DBUILD_EXAMPLES=OFF \
+	      -DBUILD_REGRESS=OFF \
+    	  -DBUILD_SHARED_LIBS=OFF \
+	      -DBUILD_TOOLS=OFF \
+    	  -DENABLE_BZIP2=OFF \
+	      -DENABLE_LZMA=OFF \
+    	  -DENABLE_ZSTD=OFF \
+    	  -DCMAKE_INSTALL_PREFIX=Qt
+	      cmake --build build-libzip
+        cmake --install build-libzip
+    - name: Compile and Install maplibre-native-qt
+      run: |
+        qt-cmake \
+		    -S maplibre-native-qt \
+        -B build-maplibre-native-qt \
+        -G Ninja \
+        -DBUILD_TESTING=OFF \
+        -DCMAKE_C_COMPILER_LAUNCHER="ccache" \
+        -DCMAKE_CXX_COMPILER_LAUNCHER="ccache" \
+        -DCMAKE_PREFIX_PATH=$Qt6_DIR \
+        -DCMAKE_INSTALL_PREFIX=Qt
+        cmake --build build-maplibre-native-qt
+        cmake --install build-maplibre-native-qt
     - name: Package
       run: |
         powershell Compress-Archive Qt enrouteDependencies_windows64.zip