[ci] Make Linux and macOS run

.github/actions/qt5-build/action.yml

@@ -1,13 +1,8 @@
 # action.yml
-name: 'Qt5 Linux Builder'
-description: 'Helper action to build in a specific Docker container'
-inputs:
-  build-type:
-    description: 'Build type'
-    required: true
-    default: 'plugin' # or 'library'
+name: "Qt5 Linux Builder"
+description: "Helper action to build in a specific Docker container"
 runs:
-  using: 'docker'
-  image: 'Dockerfile'
+  using: "docker"
+  image: "Dockerfile"
   args:
     - ${{ inputs.build-type }}

.github/actions/qt5-build/entrypoint.sh

@@ -6,26 +6,16 @@ set -e
 set -x
 
 export CCACHE_DIR="$GITHUB_WORKSPACE/.ccache"
-export PATH=$Qt5_Dir/bin:$PATH
+export PATH="$Qt5_Dir/bin:$PATH"
 qmake --version
 
-if [[ "$1" = "library" ]]; then
-  mkdir build && cd build
-  cmake ../source/vendor/maplibre-native/ \
-    -G Ninja \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-    -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-    -DCMAKE_INSTALL_PREFIX=../install-maplibre \
-    -DMLN_WITH_QT=ON \
-    -DMLN_QT_LIBRARY_ONLY=ON
-  ninja
-  ninja install
-elif [[ "$1" = "plugin" ]]; then
-  mkdir build && cd build
-  qmake ../source/ MAPLIBRE_PATH=../install-maplibre
-  make -j2
-  INSTALL_ROOT=../install make install
-else
-  exit 1
-fi
+mkdir build && cd build
+cmake ../source/ \
+  -G Ninja \
+  -DCMAKE_BUILD_TYPE="Release" \
+  -DCMAKE_C_COMPILER_LAUNCHER="ccache" \
+  -DCMAKE_CXX_COMPILER_LAUNCHER="ccache" \
+  -DCMAKE_INSTALL_PREFIX="../install"
+ninja
+ninja test
+ninja install

.github/actions/qt6-build/action.yml

@@ -1,13 +1,8 @@
 # action.yml
-name: 'Qt6 Linux Builder'
-description: 'Helper action to build in a specific Docker container'
-inputs:
-  build-type:
-    description: 'Build type'
-    required: true
-    default: 'plugin' # or 'library'
+name: "Qt6 Linux Builder"
+description: "Helper action to build in a specific Docker container"
 runs:
-  using: 'docker'
-  image: 'Dockerfile'
+  using: "docker"
+  image: "Dockerfile"
   args:
     - ${{ inputs.build-type }}

.github/actions/qt6-build/entrypoint.sh

@@ -4,15 +4,16 @@ set -e
 set -x
 
 export CCACHE_DIR="$GITHUB_WORKSPACE/.ccache"
-export PATH=$Qt6_DIR/bin:$PATH
+export PATH="$Qt6_DIR/bin:$PATH"
 qmake --version
 
 mkdir build && cd build
 qt-cmake ../source/ \
   -G Ninja \
-  -DCMAKE_BUILD_TYPE=Release \
-  -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-  -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-  -DQT_USE_CCACHE=ON
+  -DCMAKE_BUILD_TYPE="Release" \
+  -DCMAKE_C_COMPILER_LAUNCHER="ccache" \
+  -DCMAKE_CXX_COMPILER_LAUNCHER="ccache" \
+  -DCMAKE_INSTALL_PREFIX="../install"
 ninja
-DESTDIR=../install ninja install
+ninja test
+ninja install