1 files changed, 44 insertions, 9 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index f1c2c6f30..e643305e6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,7 +5,7 @@ defaults: &defaults
 jobs:
   sanity_check:
     docker:
-      - image: navit/sanity_check:latest
+      - image: circleci/android:api-29-ndk
     steps:
       - checkout
       - run:
@@ -107,19 +107,19 @@ jobs:
           command: ./gradlew generateDebugJavadoc
       - store_artifacts:
           name: Store APK
-          path: navit/android/build/outputs/apk
+          path: build/outputs/apk
           destination: apk
       - store_artifacts:
           name: Store logs
-          path: navit/android/build/outputs/logs
+          path: build/outputs/logs
           destination: logs
       - store_artifacts:
           name: Store Javadoc
-          path: navit/android/build/outputs/docs/javadoc
+          path: build/outputs/docs/javadoc
           destination: doc
       - store_artifacts:
           name: Store Lint reports
-          path: navit/android/build/reports
+          path: build/reports
           destination: reports
       - store_test_results:
           path: test-results
@@ -127,6 +127,40 @@ jobs:
           name: Update Navit-Download-Center
           command: |
             bash scripts/update_download_center.sh
+  build_fdroid:
+    docker:
+      - image: registry.gitlab.com/fdroid/ci-images-client:latest
+    steps:
+      - checkout
+      - run:
+          name: Build with F-Droid
+          command: |
+            test -d build || mkdir build
+            test -d fdroidserver || mkdir 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
+            export PATH="`pwd`/fdroidserver:$PATH"
+            export PYTHONPATH="$CI_PROJECT_DIR/fdroidserver:$CI_PROJECT_DIR/fdroidserver/examples"
+            export PYTHONUNBUFFERED=true
+            bash fdroidserver/buildserver/setup-env-vars $ANDROID_HOME
+            adduser --disabled-password --gecos "" vagrant
+            ln -s $CI_PROJECT_DIR/fdroidserver /home/vagrant/fdroidserver
+            mkdir -p /vagrant/cache
+            wget -q https://services.gradle.org/distributions/gradle-5.6.2-bin.zip --output-document=/vagrant/cache/gradle-5.6.2-bin.zip
+            bash fdroidserver/buildserver/provision-gradle
+            bash fdroidserver/buildserver/provision-apt-get-install http://deb.debian.org/debian
+            source /etc/profile.d/bsenv.sh
+            apt-get dist-upgrade
+            apt-get install -t stretch-backports fdroidserver python3-asn1crypto python3-ruamel.yaml yamllint
+            apt-get purge fdroidserver
+            export GRADLE_USER_HOME=$PWD/.gradle
+            set -x
+            apt-get install sudo
+            fdroid build --verbose --on-server --no-tarball
+      - store_artifacts:
+           name: Store APK
+           path: unsigned
+           destination: apk
   build_win32:
     docker:
       - image: ubuntu:14.04
@@ -219,13 +253,11 @@ jobs:
           command: |
             bash scripts/update_download_center.sh
   merge_trunk_in_master:
-    <<: *defaults
+    docker:
+      - image: cimg/base:2020.01
     steps:
       - checkout
       - run:
-          name: Install git
-          command: apt-get update && apt-get -y install ca-certificates git
-      - run:
           name: configure ssh git
           command: mkdir -p ~/.ssh/ && ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
       - add_ssh_keys:
@@ -268,6 +300,9 @@ workflows:
       - build_android:
           requires:
             - sanity_check
+      - build_fdroid:
+          requires:
+            - sanity_check
       - build_sailfish:
           requires:
             - sanity_check