Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,14 @@ jobs:
echo "$FASTLANE_OUTPUT"
SHARE_URL=$(echo "$FASTLANE_OUTPUT" | awk '/APP_SHARE_URL:/ {print $NF}')
echo "Google play store APK link: $SHARE_URL" >> $GITHUB_STEP_SUMMARY

# Write the Play Store link into this job's check run output
curl -s -X PATCH \
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
-H "Accept: application/vnd.github+json" \
-H "X-GitHub-Api-Version: 2026-03-10" \
"https://api.github.com/repos/${{ github.repository }}/check-runs/${{ job.check_run_id }}" \
-d "{\"output\":{\"title\":\"Android ${{ matrix.ANDROID_ABI }}\",\"summary\":\"$SHARE_URL\"}}"

- name: Build AAB
if: ${{ github.ref_name == 'master' || github.ref_type == 'tag' }}
Expand Down Expand Up @@ -309,3 +317,11 @@ jobs:
echo "$FASTLANE_OUTPUT"
SHARE_URL=$(echo "$FASTLANE_OUTPUT" | awk '/APP_SHARE_URL:/ {print $NF}')
echo "Google play store AAB link: $SHARE_URL" >> $GITHUB_STEP_SUMMARY

# Write the Play Store link into this job's check run output
curl -s -X PATCH \
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
-H "Accept: application/vnd.github+json" \
-H "X-GitHub-Api-Version: 2026-03-10" \
"https://api.github.com/repos/${{ github.repository }}/check-runs/${{ job.check_run_id }}" \
-d "{\"output\":{\"title\":\"Android ${{ matrix.ANDROID_ABI }}\",\"summary\":\"$SHARE_URL\"}}"
7 changes: 5 additions & 2 deletions .github/workflows/code_style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,12 @@ jobs:
uses: actions/checkout@v6

- name: Install Requirements
#workaround for the current false positive bug in cppcheck 2.20 (latest version)
run: |
brew update
brew install cppcheck
curl -L https://github.com/danmar/cppcheck/archive/refs/tags/2.19.1.tar.gz | tar xz
cmake -S cppcheck-2.19.1 -B cppcheck-build -DCMAKE_BUILD_TYPE=Release
cmake --build cppcheck-build -j$(sysctl -n hw.logicalcpu)
cmake --install cppcheck-build

- name: Run cppcheck test
run: ./scripts/cppcheck.bash
4 changes: 2 additions & 2 deletions .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"description": "<p>Mergin Maps mobile app is a QGIS powered app for Android and iOS devices.</p>",
"license": "GPLv3",
"title": "Mergin Maps mobile app",
"version": "2026.1.2",
"version": "2026.2.0",
"upload_type": "software",
"publication_date": "2022-02-24",
"creators": [
Expand Down Expand Up @@ -39,7 +39,7 @@
"related_identifiers": [
{
"scheme": "url",
"identifier": "https://github.com/MerginMaps/mobile/tree/2026.1.2",
"identifier": "https://github.com/MerginMaps/mobile/tree/2026.2.0",
"relation": "isSupplementTo"
},
{
Expand Down
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cff-version: 2026.1.2
cff-version: 2026.2.0
message: "If you use this software, please cite it as below."
authors:
- family-names: "Martin"
Expand Down
137 changes: 0 additions & 137 deletions CLAUDE.md

This file was deleted.

4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ cmake_minimum_required(VERSION 3.22)

# Note: To update version use script/update_all_versions.bash
set(MM_VERSION_MAJOR "2026")
set(MM_VERSION_MINOR "1")
set(MM_VERSION_PATCH "2")
set(MM_VERSION_MINOR "2")
set(MM_VERSION_PATCH "0")

if (VCPKG_TARGET_TRIPLET MATCHES ".*ios.*")
set(IOS TRUE)
Expand Down
Loading
Loading