Continue 3d terrain work

.github/scripts/notify-release-on-prs.ts

@@ -74,6 +74,8 @@ async function createOrUpdateReleaseNotification({
       return `MapLibre iOS ${version}`;
     } else if (platform === 'android') {
       return `MapLibre Android ${version}`;
+    } else if (platform === 'macos') {
+      return `MapLibre macOS ${version}`;
     }
     return tag;
   }

.github/workflows/ios-ci.yml

@@ -349,6 +349,9 @@ jobs:
 
   ios-ci-result:
     runs-on: ubuntu-latest
+    permissions:
+      actions: write
+      contents: read
     if: needs.pre_job.outputs.should_skip != 'true' && always()
     needs:
       - pre_job

.github/workflows/ios-testapp-release.yml

@@ -1,29 +1,58 @@
+name: ios-testapp-release
+
 on:
   workflow_dispatch:
 
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   ios-testapp-release:
-    runs-on: macos-latest
+    runs-on: macos-26
+    timeout-minutes: 90
     steps:
       - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           submodules: recursive
+          persist-credentials: false
 
-      - name: Setup certificate
-        run: |
-          echo "${{ secrets.IOS_DISTRIBUTION_CERTIFICATE }}" | base64 --decode > platform/ios/app-swift/MapLibre.mobileprovision
+      - uses: bazel-contrib/setup-bazel@c5acdfb288317d0b5c0bbd7a396a3dc868bb0f86 # 0.19.0
+        with:
+          bazelisk-cache: true
+          disk-cache: ${{ github.workflow }}
+          repository-cache: true
 
-      - name: Update BUILD.bazel
-        run: |
-          sed -i '' 's/xcode_profile/:MapLibre.mobileprovision/' platform/ios/app-swift/BUILD.bazel
+      - name: Install Apple signing assets
+        run: platform/ios/scripts/ios-ci-install-signing-assets.sh
+        env:
+          BUILD_CERTIFICATE_BASE64: ${{ secrets.IOS_DISTRIBUTION_CERTIFICATE }}
+          P12_PASSWORD: ${{ secrets.IOS_DISTRIBUTION_CERTIFICATE_PASSWORD }}
+          BUILD_PROVISION_PROFILE_BASE64: ${{ secrets.IOS_PROVISIONING_PROFILE }}
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+          IOS_BUNDLE_ID_PREFIX: ${{ vars.IOS_BUNDLE_ID_PREFIX }}
 
       - name: Build
-        run: bazel build //platform/ios/app-swift:MapLibreApp -c opt  --ios_multi_cpus=arm64 --//:renderer=metal --action_env=SENTRY_DSN=${{ vars.SENTRY_DSN_IOS }} --embed_label=maplibre_app_1.0_build_"$(date +%s)"
+        shell: bash
+        run: |
+          set -euo pipefail
+          build_number="$(date +%s)"
+          bazel build //platform/ios/app-swift:MapLibreApp \
+            --compilation_mode=opt \
+            --ios_multi_cpus=arm64 \
+            --//:renderer=metal \
+            --action_env=SENTRY_DSN="${{ vars.SENTRY_DSN_IOS }}" \
+            --embed_label="maplibre_app_1.0_build_${build_number}"
+          test -f bazel-bin/platform/ios/app-swift/MapLibreApp.ipa
 
-      - name: 'Upload app to TestFlight'
+      - name: Upload app to TestFlight
         uses: apple-actions/upload-testflight-build@1ad58030672057aa084b4e96beb6f7a8c627f9e6 # v5.2.1
         with:
-          app-path: 'bazel-bin/platform/ios/app-swift/MapLibreApp.ipa'
+          app-path: bazel-bin/platform/ios/app-swift/MapLibreApp.ipa
           issuer-id: ${{ vars.APPSTORE_ISSUER_ID }}
           api-key-id: ${{ vars.APPSTORE_API_KEY_ID }}
           api-private-key: ${{ secrets.APP_STORE_CONNECT_API_KEY }}
+          wait-for-processing: 'true'

.github/workflows/macos-release.yml

@@ -0,0 +1,184 @@
+name: macos-release
+
+on:
+  workflow_dispatch:
+    inputs:
+      release:
+        type: choice
+        default: full
+        options:
+          - full
+          - pre
+        description: Whether to make a release, choose full release (uses platform/ios/VERSION, shared with iOS) or pre-release
+      pre_release_version:
+        type: string
+        default: ''
+        description: Version (only for pre-releases)
+
+jobs:
+  macos-build-dynamic:
+    runs-on: macos-14
+    defaults:
+      run:
+        working-directory: platform/macos
+        shell: bash
+    steps:
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
+        with:
+          submodules: recursive
+
+      - name: Install dependencies
+        run: brew install webp libuv
+
+      - name: Build XCFramework (Dynamic)
+        run: |
+          bazel build --compilation_mode=opt --features=dead_strip,thin_lto --objc_enable_binary_stripping \
+            --apple_generate_dsym --output_groups=+dsyms --//:renderer=metal \
+            --//platform/macos:macos_loop=cfrunloop \
+            //platform/macos:MapLibre.dynamic --embed_label=maplibre_macos_"$(cat ../ios/VERSION)"
+          echo xcframework="$(bazel info execution_root)"/"$(bazel cquery --output=files --compilation_mode=opt --//:renderer=metal --//platform/macos:macos_loop=cfrunloop //platform/macos:MapLibre.dynamic)" >> "$GITHUB_ENV"
+
+      - name: Create .zip with debug symbols
+        working-directory: ./bazel-bin/platform/macos/MapLibre.dynamic_dsyms
+        run: |
+          zip MapLibre_macos_device.framework.dSYM.zip MapLibre_macos_device.framework.dSYM/Contents/Resources/DWARF/MapLibre_macos_device MapLibre_macos_device.framework.dSYM/Contents/Info.plist
+          echo debug_symbols_macos="$(realpath MapLibre_macos_device.framework.dSYM.zip)" >> "$GITHUB_ENV"
+
+      - name: Copy debug symbols to root
+        working-directory: .
+        run: cp ${{ env.debug_symbols_macos }} .
+
+      - name: Add license to XCFramework zip
+        run: |
+          cp ${{ env.xcframework }} MapLibre.dynamic.xcframework.zip
+          chmod +w MapLibre.dynamic.xcframework.zip
+          zip MapLibre.dynamic.xcframework.zip LICENSE.md
+        working-directory: .
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        with:
+          name: xcframework
+          path: |
+            MapLibre.dynamic.xcframework.zip
+            MapLibre_macos_device.framework.dSYM.zip
+
+  macos-build-static:
+    runs-on: macos-14
+    defaults:
+      run:
+        working-directory: platform/macos
+        shell: bash
+    steps:
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
+        with:
+          submodules: recursive
+
+      - name: Install dependencies
+        run: brew install webp libuv
+
+      - name: Build XCFramework (Static)
+        run: |
+          bazel build --compilation_mode=opt --copt -g --copt="-Oz" --strip never \
+            --//:renderer=metal --//platform/macos:macos_loop=cfrunloop \
+            //platform/macos:MapLibre.static --embed_label=maplibre_macos_"$(cat ../ios/VERSION)"
+          echo xcframework_static="$(bazel info execution_root)"/"$(bazel cquery --output=files --compilation_mode=opt --//:renderer=metal --//platform/macos:macos_loop=cfrunloop //platform/macos:MapLibre.static)" >> "$GITHUB_ENV"
+
+      - name: Add license to XCFramework zip
+        run: |
+          cp ${{ env.xcframework_static }} MapLibre.static.xcframework.zip
+          chmod +w MapLibre.static.xcframework.zip
+          zip MapLibre.static.xcframework.zip LICENSE.md
+        working-directory: .
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        with:
+          name: xcframework-static
+          path: |
+            MapLibre.static.xcframework.zip
+
+  macos-release:
+    permissions:
+      contents: write
+      issues: write
+    runs-on: ubuntu-latest
+    needs:
+      - macos-build-dynamic
+      - macos-build-static
+    defaults:
+      run:
+        working-directory: platform/macos
+        shell: bash
+    steps:
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
+        with:
+          submodules: recursive
+
+      - uses: actions/download-artifact@v8
+
+      - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v4
+        with:
+          node-version-file: ".nvmrc"
+
+      # macOS releases share the iOS version (platform/ios/VERSION) so both
+      # platforms stay aligned. The changelog stays macOS-specific.
+      - name: Get version (release)
+        if: github.event.inputs.release == 'full'
+        run: |
+          echo version="$(head ../ios/VERSION)" >> "$GITHUB_ENV"
+          echo changelog_version_heading="## $(head ../ios/VERSION)" >> "$GITHUB_ENV"
+
+      - name: Get version (pre-release)
+        if: github.event.inputs.release == 'pre'
+        run: |
+          version="${{ github.event.inputs.pre_release_version }}"
+          if [[ -z "$version" ]]; then
+            version="$(head ../ios/VERSION)"-pre${{ github.sha }}
+          fi
+          if [[ "$version" != *"pre"* ]]; then
+            echo "::error::Pre-release version must include 'pre' (Current version: $version)"
+            exit 1
+          fi
+          echo version="$version" >> "$GITHUB_ENV"
+          echo changelog_version_heading="## main" >> "$GITHUB_ENV"
+
+      - name: Create tag if it does not exist
+        working-directory: .
+        run: .github/scripts/ensure-tag.sh macos-v${{ env.version }} ${{ github.sha }}
+
+      - name: Extract changelog for version
+        run: |
+          awk '/^##/ { p = 0 }; p == 1 { print }; $0 == "${{ env.changelog_version_heading }}" { p = 1 };' CHANGELOG.md > changelog_for_version.md
+          cat changelog_for_version.md
+
+      - name: Release (GitHub) - Create Draft
+        uses: softprops/action-gh-release@153bb8e04406b158c6c84fc1615b65b24149a1fe # v2.6.1
+        with:
+          name: macos-v${{ env.version }}
+          files: |
+            xcframework/MapLibre.dynamic.xcframework.zip
+            xcframework/MapLibre_macos_device.framework.dSYM.zip
+            xcframework-static/MapLibre.static.xcframework.zip
+          tag_name: macos-v${{ env.version }}
+          prerelease: ${{ github.event.inputs.release == 'pre' }}
+          body_path: platform/macos/changelog_for_version.md
+          fail_on_unmatched_files: true
+          draft: true
+
+      - name: Publish release (remove draft)
+        uses: softprops/action-gh-release@153bb8e04406b158c6c84fc1615b65b24149a1fe # v2.6.1
+        with:
+          tag_name: macos-v${{ env.version }}
+          name: macos-v${{ env.version }}
+          draft: false
+
+      - run: npm install
+        working-directory: .
+
+      - name: Write release notifications
+        if: github.repository_owner == 'maplibre'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: node .github/scripts/notify-release-on-prs.ts --tag macos-v${{ env.version }}
+        working-directory: .

CHANGELOG.md

@@ -29,6 +29,7 @@
 ### 🐞 Bug fixes
 
 - *...Add new stuff here...*
+- [core] Accept alpha values in legacy comma-separated `hsl()` colors ([#4434](https://github.com/maplibre/maplibre-native/issues/4434)).
 - [core] Fix thread-unsafe headless OpenGL display singleton initialization [#4332](https://github.com/maplibre/maplibre-native/pull/4332)
 - [macos] Fix `mlt-cpp` and `mbgl-vendor-icu` not being included in the amalgamation
 - [core] Fix memory access violation exception in vector_tile_data.cpp [#632](https://github.com/maplibre/maplibre-native/pull/632)

CMakeLists.txt

@@ -185,6 +185,7 @@ list(APPEND SRC_FILES
     ${PROJECT_SOURCE_DIR}/src/mbgl/renderer/tile_layer_group.cpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/renderer/layer_tweaker.cpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/renderer/render_terrain.cpp
+    ${PROJECT_SOURCE_DIR}/src/mbgl/renderer/dem_elevation_provider.cpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/renderer/texture_pool.cpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/renderer/layers/background_layer_tweaker.cpp
     ${PROJECT_SOURCE_DIR}/src/mbgl/renderer/layers/background_layer_tweaker.hpp
@@ -1220,7 +1221,7 @@ endif()
 # The Xcode generator with Dawn component targets (no monolithic library) breaks export()
 # because dawn_native/dawn_proc aren't in an export set. Skip export in that case.
 set(_can_export TRUE)
-if(TARGET mbgl-vendor-dawn AND NOT TARGET dawn::webgpu_dawn)
+if(TARGET mbgl-vendor-dawn AND NOT TARGET dawn::webgpu_dawn AND NOT MLN_WEBGPU_EMDAWN)
     set(_can_export FALSE)
 endif()
 if(_can_export)