diff --git a/.github/workflows/ios-ci.yml b/.github/workflows/ios-ci.yml index 868c62282..97df2c9b2 100644 --- a/.github/workflows/ios-ci.yml +++ b/.github/workflows/ios-ci.yml @@ -194,6 +194,20 @@ jobs: folder: build/docs target-folder: ios/latest/ + ios-release: + runs-on: macos-14 + needs: ios-build + if: github.ref == 'refs/heads/main' + defaults: + run: + working-directory: platform/ios + shell: bash + steps: + - uses: actions/checkout@v4 + with: + submodules: recursive + fetch-depth: 0 + - name: VERSION file changed id: version-file-ios-changed uses: tj-actions/changed-files@v44 @@ -204,15 +218,17 @@ jobs: - name: Should make release? if: | github.event.inputs.release == 'full' || github.event.inputs.release == 'pre' || - (github.event_name == 'push' && github.ref == 'refs/heads/main' && steps.version-file-ios-changed.outputs.any_changed == 'true') + (github.event_name == 'push' && steps.version-file-ios-changed.outputs.any_changed == 'true') run: echo make_release=true >> "$GITHUB_ENV" - name: Build XCFramework + if: env.make_release run: | bazel build --compilation_mode=opt --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: Create .zip with debug symbols + if: env.make_release 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 diff --git a/.github/workflows/ios-release.yml b/.github/workflows/ios-release.yml deleted file mode 100644 index 41bd28df2..000000000 --- a/.github/workflows/ios-release.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: ios-release - -on: - workflow_dispatch: - -jobs: - build: - runs-on: [self-hosted, macOS, ARM64] - defaults: - run: - working-directory: platform/ios - shell: bash - - steps: - - uses: actions/checkout@v4 - with: - submodules: recursive - fetch-depth: 0 - - - name: npm install - run: npm ci --ignore-scripts - - - run: chmod +x scripts/deploy-swift-package.sh - - - run: cp bazel/example_config.bzl bazel/config.bzl - - - name: Build, package, and upload iOS release - run: scripts/deploy-swift-package.sh - env: - DIST_GITHUB_TOKEN: ${{ secrets.DIST_GITHUB_TOKEN }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md index cbd9169f4..2ef80767c 100644 --- a/platform/ios/CHANGELOG.md +++ b/platform/ios/CHANGELOG.md @@ -4,6 +4,10 @@ MapLibre welcomes participation and contributions from everyone. Please read [`C ## main +## 6.3.1 + +- Add debug symbols to releases (see [Releases on GitHub](https://github.com/maplibre/maplibre-native/releases?q=ios&expanded=true)). + ## 6.3.0 - Temporary workaround for map display freeze / stutter when using annotation views with Metal backend. [Issue 2117](https://github.com/maplibre/maplibre-native/issues/2117) fixed by [PR 2148](https://github.com/maplibre/maplibre-native/pull/2148). diff --git a/platform/ios/VERSION b/platform/ios/VERSION index e7e42a4b5..39ee137ba 100644 --- a/platform/ios/VERSION +++ b/platform/ios/VERSION @@ -1 +1 @@ -6.3.0 \ No newline at end of file +6.3.1 \ No newline at end of file