From 15476b0baa82f113fe6ad3e742647b1447b8bfac Mon Sep 17 00:00:00 2001
From: Bart Louwers <bart@emeel.net>
Date: Wed, 21 Jan 2026 11:51:48 +0100
Subject: [PATCH] Fix ios-release.yml and release MapLibre iOS 6.23.0 (#4066)

---
 .github/workflows/ios-release.yml | 45 +++++++++++++++----------------
 platform/ios/CHANGELOG.md         |  5 ++++
 platform/ios/VERSION              |  2 +-
 3 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/ios-release.yml b/.github/workflows/ios-release.yml
index a8f3f12c7..6cf7b41c5 100644
--- a/.github/workflows/ios-release.yml
+++ b/.github/workflows/ios-release.yml
@@ -37,29 +37,6 @@ jobs:
         with:
           node-version-file: ".nvmrc"
 
-      - name: Create tag
-        run: |
-          git tag -a ios-v${{ env.version }} -m "Publish ios-v${{ env.version }}" ${{ github.sha }}
-          git push origin ios-v${{ env.version }}
-
-      - 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/ios:MapLibre.dynamic --embed_label=maplibre_ios_"$(cat VERSION)"
-          echo xcframework="$(bazel info execution_root)"/"$(bazel cquery --output=files --compilation_mode=opt --//:renderer=metal //platform/ios:MapLibre.dynamic)" >> "$GITHUB_ENV"
-
-      - name: Build XCFramework (Static)
-        # for now, just build it TODO: make a static framework release
-        run: |
-          bazel build //platform/ios:MapLibre.static --//:renderer=metal --compilation_mode="opt" --copt -g --copt="-Oz" --strip never --output_groups=+dsyms --apple_generate_dsym
-          echo xcframework_static="$(bazel info execution_root)"/"$(bazel cquery --output=files --compilation_mode=opt --//:renderer=metal //platform/ios:MapLibre.static)" >> "$GITHUB_ENV"
-
-      - name: Create .zip with debug symbols
-        working-directory: ./bazel-bin/platform/ios/MapLibre.dynamic_dsyms
-        run: |
-          zip MapLibre_ios_device.framework.dSYM.zip MapLibre_ios_device.framework.dSYM/Contents/Resources/DWARF/MapLibre_ios_device MapLibre_ios_device.framework.dSYM/Contents/Info.plist
-          echo debug_symbols_ios="$(realpath MapLibre_ios_device.framework.dSYM.zip)" >> "$GITHUB_ENV"
-
       - name: Get version (release)
         if: github.event.inputs.release == 'full'
         run: |
@@ -80,6 +57,28 @@ jobs:
           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 ios-v${{ env.version }} ${{ github.sha }}
+
+      - 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/ios:MapLibre.dynamic --embed_label=maplibre_ios_"$(cat VERSION)"
+          echo xcframework="$(bazel info execution_root)"/"$(bazel cquery --output=files --compilation_mode=opt --//:renderer=metal //platform/ios:MapLibre.dynamic)" >> "$GITHUB_ENV"
+
+      - name: Build XCFramework (Static)
+        # for now, just build it TODO: make a static framework release
+        run: |
+          bazel build //platform/ios:MapLibre.static --//:renderer=metal --compilation_mode="opt" --copt -g --copt="-Oz" --strip never --output_groups=+dsyms --apple_generate_dsym
+          echo xcframework_static="$(bazel info execution_root)"/"$(bazel cquery --output=files --compilation_mode=opt --//:renderer=metal //platform/ios:MapLibre.static)" >> "$GITHUB_ENV"
+
+      - name: Create .zip with debug symbols
+        working-directory: ./bazel-bin/platform/ios/MapLibre.dynamic_dsyms
+        run: |
+          zip MapLibre_ios_device.framework.dSYM.zip MapLibre_ios_device.framework.dSYM/Contents/Resources/DWARF/MapLibre_ios_device MapLibre_ios_device.framework.dSYM/Contents/Info.plist
+          echo debug_symbols_ios="$(realpath MapLibre_ios_device.framework.dSYM.zip)" >> "$GITHUB_ENV"
+
       - 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
diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md
index e107349d0..72ead3c3b 100644
--- a/platform/ios/CHANGELOG.md
+++ b/platform/ios/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 MapLibre welcomes participation and contributions from everyone. Please read [`MapLibre iOS Developer Guide`](https://maplibre.org/maplibre-native/docs/book/ios/index.html) to get started.
 
+## 6.23.0
+
+- Add basic support for setting camera roll ([#4061](https://github.com/maplibre/maplibre-native/pull/4059)).
+- Make rendering stats thread safe ([#4059](https://github.com/maplibre/maplibre-native/pull/4059)).
+
 ## 6.22.2
 
 - Metal backend resource for MacOS fixes ([#4020](https://github.com/maplibre/maplibre-native/pull/4020)).
diff --git a/platform/ios/VERSION b/platform/ios/VERSION
index 9e55b202e..0b31cc63b 100644
--- a/platform/ios/VERSION
+++ b/platform/ios/VERSION
@@ -1 +1 @@
-6.22.2
+6.23.0