Skip to content

Fix android CI #4122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tomasMizera merged 5 commits into from
Oct 3, 2025
Merged

Fix android CI #4122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3cdd158
Fix android CI
Withalion Sep 30, 2025
12fb106
Update version to 2025.7.0
Withalion Sep 30, 2025
fc8d7a1
Force building AAB
Withalion Oct 2, 2025
fb1b05d
Fix apk size
Withalion Oct 2, 2025
70df910
Add comments & uncomment AAB building condition
Withalion Oct 2, 2025
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
17 changes: 5 additions & 12 deletions .github/workflows/android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,16 +193,12 @@ jobs:

- name: Configure app
env:
ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
ANDROID_NDK_HOST: darwin-x86_64

ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
run: |
mkdir -p ${{ github.workspace }}/build-mm
cd ${{ github.workspace }}/build-mm

export PATH=${{ env.VCPKG_ROOT }}:$PATH
export ANDROID_NDK_HOME=${{ steps.setup-ndk.outputs.ndk-path }}
export ANDROID_NDK_ROOT=${{ steps.setup-ndk.outputs.ndk-path }}
export ANDROID_ABI=${{ matrix.ANDROID_ABI }}

cmake \
Expand All @@ -226,8 +222,7 @@ jobs:

- name: Build APK
env:
ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
ANDROID_NDK_HOST: darwin-x86_64
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
run: |
cd ${{ github.workspace }}/build-mm
ninja apk
Expand All @@ -250,11 +245,9 @@ jobs:
- name: Build AAB
if: ${{ github.ref_name == 'master' || startsWith( github.ref_name, 'dev/' ) || github.ref_type == 'tag' }}
env:
ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
ANDROID_NDK_HOST: darwin-x86_64
QT_BASE: ${{ github.workspace }}/Qt/${{ env.QT_VERSION }}
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
run: |
cd ${{ github.workspace }}/build-Input
cd ${{ github.workspace }}/build-mm
ninja aab

echo "AAB:"
Expand All @@ -272,4 +265,4 @@ jobs:
uses: actions/upload-artifact@v4
with:
path: ${{ github.workspace }}/merginmaps-${{ env.INPUT_VERSION_CODE }}.aab
name: Mergin Maps ${{ env.INPUT_VERSION_CODE }} AAB
name: Mergin Maps ${{ env.INPUT_VERSION_CODE }} AAB [${{ matrix.ANDROID_ABI }}]
4 changes: 2 additions & 2 deletions .zenodo.json
View file
Open in desktop
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": "2025.6.0",
"version": "2025.7.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/2025.6.0",
"identifier": "https://github.com/MerginMaps/mobile/tree/2025.7.0",
"relation": "isSupplementTo"
},
{
Expand Down
2 changes: 1 addition & 1 deletion CITATION.cff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cff-version: 2025.6.0
cff-version: 2025.7.0
message: "If you use this software, please cite it as below."
authors:
- family-names: "Martin"
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.22)

# Note: To update version use script/update_all_versions.bash
set(MM_VERSION_MAJOR "2025")
set(MM_VERSION_MINOR "6")
set(MM_VERSION_MINOR "7")
set(MM_VERSION_PATCH "0")

if (VCPKG_TARGET_TRIPLET MATCHES ".*ios.*")
Expand Down
2 changes: 2 additions & 0 deletions cmake_templates/build.gradle.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ android {
compileSdkVersion androidCompileSdkVersion
buildToolsVersion androidBuildToolsVersion
ndkVersion androidNdkVersion
// don't get rid of this line as it inflates the final bundle size 5x
ndkPath '@INPUT_ANDROID_NDK_PATH@'
Comment on lines +49 to +50
Copy link
Collaborator

@tomasMizera tomasMizera Oct 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we know why? :)

Copy link
Contributor Author

@Withalion Withalion Oct 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no clue :)


packagingOptions.jniLibs.useLegacyPackaging true

Expand Down
2 changes: 1 addition & 1 deletion vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"name": "merginmaps-mobile-app",
"description": "Collect. Share. Publish.",
"version": "2025.6.0",
"version": "2025.7.0",
"homepage": "https://github.com/merginmaps/mobile",
"dependencies": [
{
Expand Down
Loading