Merge branch 'fetchsrclibs' into 'master'

make fetchsrclibs plugin work without any Android SDK; add test

See merge request fdroid/fdroidserver!848

.gitlab-ci.yml

@@ -247,9 +247,6 @@ gradle:
 fdroid build:
   image: registry.gitlab.com/fdroid/ci-images-client
   only:
-    refs:
-      - branches
-      - pipelines
     changes:
       - .gitlab-ci.yml
       - buildserver/provision-apt-get-install
@@ -293,6 +290,41 @@ fdroid build:
     - fdroid build --verbose --on-server --no-tarball --latest org.fdroid.fdroid
 
 
+plugin_fetchsrclibs:
+  image: debian:buster
+  <<: *apt-template
+  only:
+    changes:
+      - .gitlab-ci.yml
+      - examples/fdroid_fetchsrclibs.py
+      - fdroidserver/__main__.py
+  script:
+    - apt-get install
+        curl
+        git
+        python3-pip
+        python3-venv
+    - python3 -m venv env
+    - . env/bin/activate
+    - export PATH="$CI_PROJECT_DIR:$PATH"
+    - export PYTHONPATH="$CI_PROJECT_DIR/examples"
+    - $pip install wheel # to make this go away: "error: invalid command 'bdist_wheel'"
+    - $pip install -e .
+    - fdroid | grep fetchsrclibs
+
+    - mkdir fdroiddata
+    - curl https://gitlab.com/fdroid/fdroiddata/repository/b9e9a077d720c86ff6fff4dbb341254cc4370b1a/archive.tar.gz
+          | tar -xz --directory=fdroiddata --strip-components=1
+    - cd fdroiddata
+    - fdroid fetchsrclibs freemap.opentrail:9 --verbose
+    - test -d build/freemap.opentrail/.git
+    - test -d build/srclib/andromaps/.git
+    - test -d build/srclib/freemaplib/.git
+    - test -d build/srclib/freemaplibProj/.git
+    - test -d build/srclib/JCoord/.git
+    - test -d build/srclib/javaproj/.git
+
+
 # test a full update and deploy cycle to gitlab.com
 servergitmirrors:
   image: debian

examples/fdroid_fetchsrclibs.py

@@ -14,11 +14,6 @@ fdroid_summary = 'prepare the srclibs for `fdroid build --on-server`'
 
 
 def main():
-    common.config = {
-        'accepted_formats': 'yml',
-        'sdk_path': os.getenv('ANDROID_HOME'),
-    }
-    common.fill_config_defaults(common.config)
     parser = argparse.ArgumentParser(usage="%(prog)s [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
     common.setup_global_opts(parser)
     parser.add_argument("appid", nargs='*', help=_("applicationId with optional versionCode in the form APPID[:VERCODE]"))

fdroidserver/common.py

@@ -2741,9 +2741,11 @@ def set_FDroidPopen_env(build=None):
     if env is None:
         env = os.environ
         orig_path = env['PATH']
+        if config:
+            if config.get('sdk_path'):
                 for n in ['ANDROID_HOME', 'ANDROID_SDK']:
                     env[n] = config['sdk_path']
-        for k, v in config['java_paths'].items():
+            for k, v in config.get('java_paths', {}).items():
                 env['JAVA%s_HOME' % k] = v
 
     missinglocale = True