Add:ci:Update F-Droid CI to Debian bullseye

Signed-off-by: mvglasow <michael -at- vonglasow.com>

2 files changed, 38 insertions, 19 deletions

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5d738dd73..804ab963d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -126,7 +126,7 @@ jobs:
             bash scripts/update_download_center.sh
   build_fdroid:
     docker:
-      - image: registry.gitlab.com/fdroid/fdroidserver:buildserver-stretch
+      - image: registry.gitlab.com/fdroid/fdroidserver:buildserver-bullseye
     steps:
       - checkout
       - run:
@@ -139,28 +139,47 @@ jobs:
 
             test -n "$fdroidserver" || source /etc/profile.d/bsenv.sh
 
-            # APP_CI: we need to install fdroidserver from source (the link path will differ from fdroidserver CI)
-            test -d fdroidserver || mkdir fdroidserver
+            # APP_CI: we need to install fdroidserver from source, directly into $fdroidserver, and set ownership accordingly
+            test -d $fdroidserver || mkdir -p $fdroidserver
             git ls-remote https://gitlab.com/fdroid/fdroidserver.git master
-            curl --silent https://gitlab.com/fdroid/fdroidserver/-/archive/master/fdroidserver-master.tar.gz | tar -xz --directory=fdroidserver --strip-components=1
-            ln -fsv $PWD/fdroidserver "$fdroidserver"
+            curl --silent https://gitlab.com/fdroid/fdroidserver/-/archive/master/fdroidserver-master.tar.gz | tar -xz --directory=$fdroidserver --strip-components=1
+            chown -R vagrant $fdroidserver
 
-            # APP_CI: skip fdroiddata download as we’re building from our own recipe
-            for d in build logs repo tmp unsigned $home_vagrant/.android; do
-              test -d $d || mkdir $d;
-              chown -R vagrant $d;
-            done
+            # TODO remove sdkmanager install once it is included in the buildserver image
+            apt-get install sdkmanager
+            rm -rf "$ANDROID_HOME/tools" # TODO remove once sdkmanager can upgrade installed packages
+            sdkmanager "tools" "platform-tools" "build-tools;31.0.0"
 
+            # APP_CI:
+            # Skip fdroiddata download as we’re building from our own recipe.
+            # Since we are not fetching source code but building from the project dir, we need to modify permissions:
+            #   - Since we are in another user’s home dir, we grant permissions via group.
+            #   - git needs read/execute on all parents of the source code dir.
+            #   - fdroid creates subdirs, so the source code dir must be writable.
+            # $home_vagrant/.android gets created and chowned just like on fdroidserver CI.
+            chgrp -R vagrant $PWD
+            chmod -R g+r $PWD
+            chmod g+w $PWD
+            chgrp vagrant ..
+            chmod g+rx-w ..
+            test -d $home_vagrant/.android || mkdir $home_vagrant/.android
+            chown -R vagrant $home_vagrant/.android
+
+            # APP_CI: for some reason fdroid complains about missing git but runs fine when the warning is suppressed
             export GRADLE_USER_HOME=$home_vagrant/.gradle
-            # APP_CI: we run F-Droid in a slightly different manner
-            export PATH=$fdroidserver:$PATH
-            export PYTHONPATH=$fdroidserver:$fdroidserver/examples
-            export PYTHONUNBUFFERED=true
+            export fdroid="sudo --preserve-env --user vagrant
+              env PATH=$fdroidserver:$PATH
+              env PYTHONPATH=$fdroidserver:$fdroidserver/examples
+              env PYTHONUNBUFFERED=true
+              env TERM=$TERM
+              env HOME=$home_vagrant
+              env GIT_PYTHON_REFRESH=quiet
+              fdroid"
 
             chown -R vagrant $home_vagrant
 
             # APP_CI: just build our own app
-            fdroid build --verbose --on-server --no-tarball
+            $fdroid build --verbose --on-server --no-tarball
       - store_artifacts:
            name: Store APK
            path: unsigned
diff --git a/.fdroid.yml b/.fdroid.yml
index 1e314c64b..e1011f200 100644
--- a/.fdroid.yml
+++ b/.fdroid.yml
@@ -31,18 +31,18 @@ Builds:
     # therefore we use dummy values and skip the version check
     novcheck: yes
     commit: HEAD
+    sudo:
+      - apt-get update
+      - apt-get install -y build-essential cmake gettext libpng-dev librsvg2-bin libsaxonb-java rename zlib1g-dev
     gradle:
       - yes
     output: build/outputs/apk/release/navit-release.apk
     rm:
       - navit/support/espeak/espeak-data/*
     prebuild:
-      # ndk is needed because of CI limitations and can be removed once the CI image comes with NDK 20
-      - $$SDK$$/tools/bin/sdkmanager "cmake;3.6.4111459" "ndk;20.0.5594570" > /dev/null
       - sed -i -e '/gradlew/d' scripts/build_android.sh
     build: scripts/build_android.sh
-    # disable for now because of CI limitations
-    #ndk: r20b
+    ndk: r20b
 
 MaintainerNotes: |-
     Found JAR file at navit/android/libs/TTS_library_stub.jar, removed as of v0.5.3-442-g96d9c41.