Merge branch 'fix/fdroid' into 'main'

Fixed FDroid CI

See merge request fabinfra/fabaccess/borepin!73

.gitlab-ci.yml

@@ -214,26 +214,28 @@ pages:
         - if: $CI_COMMIT_TAG != null && $CI_COMMIT_TAG =~ $VERSION_PATTERN
     tags:
         - docker
-    image: 
-        name: registry.gitlab.com/fdroid/docker-executable-fdroidserver:latest
-        entrypoint: [""]
-    variables:
-        LC_ALL: 'en_US.UTF-8'
-        LANG: 'en_US.UTF-8'
-
+    image:
+        name: ubuntu
+        # name: registry.gitlab.com/fdroid/docker-executable-fdroidserver:master
+    variables: 
+        DEBIAN_FRONTEND: noninteractive
+        TZ: Europe/Berlin
     before_script:
+        - 'apt-get update -yqq && apt-get install -yqq fdroidserver'
         - 'export VERSION_NUMBER=${CI_COMMIT_TAG:1}'
         - 'export BUILD_NUMBER="$CI_PIPELINE_ID"'
         - 'cp -r fdroid/* .'
-        - 'echo "keystorepass: ${FDroid_KeyStore_Password}" >> config.yml'
-        - 'echo "keypass: ${FDroid_KeyStore_Password}" >> config.yml'
-        - 'echo ${FDroid_KeyStore} | base64 -d > keystore.p12'
+        - 'echo "keystorepass: ${FDroidKeyStore_Password}" >> config.yml'
+        - 'echo "keypass: ${FDroidKeyStore_Password}" >> config.yml'
+        - 'echo ${FDroidKeyStore} | base64 -d > keystore.p12'
+        # - 'cat config.yml'
+        # - sha1sum keystore.p12
     script:
-        - 'mkdir repo'
+        - 'mkdir -p repo'
         - 'cp Borepin/Borepin.Android/bin/Release/org.fab_infra.fabaccess-Signed.apk repo/'
         - 'fdroid update'
-        - 'mkdir -p public'
-        - 'cp -r repo/* public/'
+        - 'mkdir -p public/fdroid'
+        - 'cp -r repo public/fdroid/'
         - 'rm keystore.p12'
     artifacts:
         paths:

fdroid/config.yml

@@ -4,6 +4,6 @@ keydname: CN=Persephone, OU=F-Droid
 
 
 
-repo_url: "https://fdroid.fab-access.org"
+repo_url: "https://fdroid.fab-access.org/fdroid/repo"
 repo_name: "FabAccess F-Droid Repo"
 repo_description: F-Droid repo for FabAccess.

fdroid/metadata/org.fab_infra.fabaccess.yml

@@ -5,4 +5,5 @@ IssueTracker: 'https://gitlab.com/fabinfra/fabaccess/borepin/-/issues'
 Name: FabAccess
 SourceCode: 'https://gitlab.com/fabinfra/fabaccess/borepin'
 Summary: 'FabAccess is a federatable management system for FabLabs, Makerspaces and Hackerspaces. FabAccess aims to manage access to machines in order to avoid accidents.'
-WebSite: 'https://fab-access.org'
+WebSite: 'https://fab-access.org'
+License: GPL-3.0-only