From 84838209e452dc6e91665dc26c83f8ff83c862b4 Mon Sep 17 00:00:00 2001 From: Bart Louwers Date: Sun, 25 Feb 2024 16:24:34 +0100 Subject: [PATCH] Prepare for iOS 6.1.1 release (#2143) --- .github/workflows/ios-ci.yml | 12 ++++++++++-- platform/ios/CHANGELOG.md | 6 +++++- platform/ios/VERSION | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ios-ci.yml b/.github/workflows/ios-ci.yml index 8a3b0e72e..6373c7008 100644 --- a/.github/workflows/ios-ci.yml +++ b/.github/workflows/ios-ci.yml @@ -196,9 +196,17 @@ jobs: folder: build/docs target-folder: ios/latest/ + - name: VERSION file changed + id: version-file-ios-changed + uses: tj-actions/changed-files@v42 + with: + files: platform/ios/VERSION + # Make Metal XCFramework release - name: Should make release? - if: github.event.inputs.release == 'full' || github.event.inputs.release == 'pre' + 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') run: echo make_release=true >> "$GITHUB_ENV" - name: Build XCFramework @@ -207,7 +215,7 @@ jobs: echo xcframework="$(bazel info execution_root)"/"$(bazel cquery --output=files --compilation_mode=opt --//:renderer=metal //platform/ios:MapLibre.dynamic)" >> "$GITHUB_ENV" - name: Get version (release) - if: github.event.inputs.release == 'full' + if: github.event.inputs.release == 'full' || steps.version-file-ios-changed.outputs.any_changed == 'true' run: | echo version="$(head VERSION)" >> "$GITHUB_ENV" echo changelog_version_heading="## $(head VERSION)" >> "$GITHUB_ENV" diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md index 52b887cef..603710e08 100644 --- a/platform/ios/CHANGELOG.md +++ b/platform/ios/CHANGELOG.md @@ -4,9 +4,13 @@ MapLibre welcomes participation and contributions from everyone. Please read [`C ## main +## 6.1.1 + +- Tighten camera equality requirements ([#2139](https://github.com/maplibre/maplibre-native/pull/2139)). + ## 6.1.0 -- Addition of an MLNCustomStyleLayer that allows running custom Metal shaders and code. Example included in the PR. ([#2041](https://github.com/maplibre/maplibre-native/pull/2006)) +- Addition of an MLNCustomStyleLayer that allows running custom Metal shaders and code. Example included in the PR. ([#2006](https://github.com/maplibre/maplibre-native/pull/2006)) - Various performance optimizations. - Avoid redundant bindings/states based on Metal profiler feedback. ([#2006](https://github.com/maplibre/maplibre-native/pull/2006)) - Eliminate the remaining examples of tweakers being re-created on each update, which reduced reuse of uniform buffers. ([#2050](https://github.com/maplibre/maplibre-native/pull/2050)) diff --git a/platform/ios/VERSION b/platform/ios/VERSION index 358e78e60..132c6def5 100644 --- a/platform/ios/VERSION +++ b/platform/ios/VERSION @@ -1 +1 @@ -6.1.0 \ No newline at end of file +6.1.1 \ No newline at end of file