use taiki-e/install-action to install armerge

Author: louwers

.github/scripts/install-linux-deps

@@ -13,4 +13,3 @@ DEBIAN_FRONTEND=noninteractive sudo apt-get install -y \
   llvm \
   glslang-dev \
   libbz2-dev
-cargo install armerge@2.2.0

.github/workflows/core-release.yml

@@ -51,19 +51,21 @@ jobs:
 
       - run: brew install webp libuv
 
-      - run: cargo install armerge@2.2.0
+      - uses: taiki-e/install-action@020705266844b275b711684191e11281be48860c # v2
+        with:
+          tool: armerge@2
 
       - name: Build mbgl-core for macOS
         run: |
           cmake --preset macos-core -DCMAKE_CXX_COMPILER_LAUNCHER=""
-          cmake --build --preset macos-core
+          cmake --build build-macos --target mbgl-core
 
       - name: Rename artifact
         run: |
           cp build-macos/libmbgl-core.a libmaplibre-native-core-macos-arm64-metal.a
           cp build-macos/libmbgl-core-amalgam.a libmaplibre-native-core-amalgam-macos-arm64-metal.a
 
-      - name: Upload macos-metal-build artifact
+      - name: Upload macOS artifacts
         if: github.event_name == 'pull_request'
         uses: actions/upload-artifact@v4
         with:
@@ -72,7 +74,7 @@ jobs:
             libmaplibre-native-core-macos-arm64-metal.a
             libmaplibre-native-core-amalgam-macos-arm64-metal.a
 
-      - name: Upload macOS artifact
+      - name: Upload macOS artifacts (release)
         if: github.event_name == 'workflow_dispatch'
         run: |
           gh release upload core-${{ github.sha }} libmaplibre-native-core-macos-arm64-metal.a
@@ -102,6 +104,10 @@ jobs:
       - name: Install dependencies
         run: .github/scripts/install-linux-deps
 
+      - uses: taiki-e/install-action@020705266844b275b711684191e11281be48860c # v2
+        with:
+          tool: armerge@2
+
       - name: Build mbgl-core for Linux
         run: |
           cmake --preset linux-${{ matrix.renderer }} -DCMAKE_CXX_COMPILER_LAUNCHER=""
@@ -112,7 +118,16 @@ jobs:
           cp build-linux-${{ matrix.renderer }}/libmbgl-core.a libmaplibre-native-core-linux-${{ matrix.runner.arch }}-${{ matrix.renderer }}.a
           cp build-linux-${{ matrix.renderer }}/libmbgl-core-amalgam.a libmaplibre-native-core-amalgam-linux-${{ matrix.runner.arch }}-${{ matrix.renderer }}.a
 
-      - name: Upload Linux artifact
+      - name: Upload Linux artifacts
+        if: github.event_name == 'pull_request'
+        uses: actions/upload-artifact@v4
+        with:
+          name: linux-${{ matrix.runner.arch }}-${{ matrix.renderer }}-build
+          path: |
+            libmaplibre-native-core-linux-${{ matrix.runner.arch }}-${{ matrix.renderer }}.a
+            libmaplibre-native-core-amalgam-linux-${{ matrix.runner.arch }}-${{ matrix.renderer }}.a
+
+      - name: Upload Linux artifacts (release)
         if: github.event_name == 'workflow_dispatch'
         run: |
           gh release upload core-${{ github.sha }} libmaplibre-native-core-linux-${{ matrix.runner.arch }}-${{ matrix.renderer }}.a
@@ -145,6 +160,14 @@ jobs:
         run: Copy-Item build-windows-${{ matrix.renderer }}/mbgl-core.lib maplibre-native-core-windows-x64-${{ matrix.renderer }}.lib
 
       - name: Upload Windows artifact
+        if: github.event_name == 'pull_request'
+        uses: actions/upload-artifact@v4
+        with:
+          name: windows-${{ matrix.renderer }}-build
+          path: |
+            maplibre-native-core-windows-x64-${{ matrix.renderer }}.lib
+
+      - name: Upload Windows artifact (release)
         if: github.event_name == 'workflow_dispatch'
         run: gh release upload core-${{ github.sha }} maplibre-native-core-windows-x64-${{ matrix.renderer }}.lib
         env:

.github/workflows/linux-ci.yml

@@ -78,6 +78,10 @@ jobs:
       - name: Install dependencies
         run: .github/scripts/install-linux-deps
 
+      - uses: taiki-e/install-action@020705266844b275b711684191e11281be48860c # v2
+        with:
+          tool: armerge@2
+
       - if: matrix.variant.rust
         run: cargo install cxxbridge-cmd --version 1.0.157 --locked
 

CMakePresets.json

@@ -70,14 +70,6 @@
         "MLN_DARWIN_USE_LIBUV": "OFF"
       }
     },
-    {
-      "name": "macos-core",
-      "inherits": "macos",
-      "cacheVariables": {
-        "MLN_CORE_INCLUDE_DEPS": "ON",
-        "MLN_WITH_GLFW": "OFF"
-      }
-    },
     {
       "name": "linux",
       "hidden": true,
@@ -185,7 +177,7 @@
   "buildPresets": [
     {
       "name": "macos-core",
-      "configurePreset": "macos-core",
+      "configurePreset": "macos",
       "targets": ["mbgl-core"]
     },
     {