From 306845c18d497ccd9f14b830ff95acfbf5d2c602 Mon Sep 17 00:00:00 2001
From: Bart Louwers <bart@emeel.net>
Date: Thu, 27 Nov 2025 21:52:08 +0100
Subject: [PATCH] Include static XCFramework in GitHub iOS release (#3974)

---
 .github/workflows/ios-ci.yml | 10 ++++++++--
 platform/ios/CHANGELOG.md    |  6 +++++-
 platform/ios/VERSION         |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ios-ci.yml b/.github/workflows/ios-ci.yml
index f22d72984..4eefeb4d4 100644
--- a/.github/workflows/ios-ci.yml
+++ b/.github/workflows/ios-ci.yml
@@ -261,7 +261,9 @@ jobs:
 
       - 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
+        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
         if: env.make_release
@@ -317,8 +319,11 @@ jobs:
         if: env.make_release
         run: |
           cp ${{ env.xcframework }} MapLibre.dynamic.xcframework.zip
+          cp ${{ env.xcframework_static }} MapLibre.static.xcframework.zip
           chmod +w MapLibre.dynamic.xcframework.zip
+          chmod +w MapLibre.static.xcframework.zip
           zip MapLibre.dynamic.xcframework.zip LICENSE.md  # add license to zip
+          zip MapLibre.static.xcframework.zip LICENSE.md  # add license to zip
         working-directory: .
 
       - name: Release (GitHub) - Create Draft
@@ -329,6 +334,7 @@ jobs:
           name: ios-v${{ env.version }}
           files: |
             MapLibre.dynamic.xcframework.zip
+            MapLibre.static.xcframework.zip
             ${{ env.debug_symbols_ios }}
           tag_name: ios-v${{ env.version }}
           prerelease: ${{ github.event.inputs.release == 'pre' }}
@@ -360,7 +366,7 @@ jobs:
             -d '{"ref":"main","inputs":{
               "changelog_url": "https://maplibre-native.s3.eu-central-1.amazonaws.com/changelogs/ios-${{ env.version }}.md",
               "version":"${{ env.version }}",
-              "download_url": "https://github.com/maplibre/maplibre-native/releases/download/ios-v${{ env.version }}/MapLibre.dynamic.xcframework.zip"'
+              "download_url": "https://github.com/maplibre/maplibre-native/releases/download/ios-v${{ env.version }}/MapLibre.dynamic.xcframework.zip"}}'
 
       - run: npm install
         working-directory: .
diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md
index 80f611d45..47b3f5c75 100644
--- a/platform/ios/CHANGELOG.md
+++ b/platform/ios/CHANGELOG.md
@@ -2,7 +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.21.0
+## 6.21.1
+
+- Include static XCFramework in GitHub release.
+
+## 6.21.0
 
 - Allow setting frustum offset to not render edges of the screen ([#3676](https://github.com/maplibre/maplibre-native/pull/3676)).
 - Support hiding attribution on iOS ([#3952](https://github.com/maplibre/maplibre-native/pull/3952)).
diff --git a/platform/ios/VERSION b/platform/ios/VERSION
index 7ecad1405..476d3ceb7 100644
--- a/platform/ios/VERSION
+++ b/platform/ios/VERSION
@@ -1 +1 @@
-6.21.0
+6.21.1