From 5a152ad595c45099faf57f13a7ff440d53183d6e Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Wed, 14 Sep 2022 23:30:07 +0300
Subject: [PATCH] fix CI

---
 Dockerfile | 6 +++---
 ci.py      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 021ecea4..aa305aa4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,7 +36,7 @@ RUN git config --system --add safe.directory $FLUTTER_HOME
 
 ENV ANDROID_HOME "/opt/android-sdk"
 ENV ANDROID_SDK_ROOT "${ANDROID_HOME}"
-ENV PATH "$PATH:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:/opt/flutter/bin"
+ENV PATH "$PATH:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:$ANDROID_SDK_ROOT/build-tools/30.0.3:/opt/flutter/bin"
 
 # Install needed Android SDK packages
 RUN yes | sdkmanager 'build-tools;30.0.3' 'platforms;android-29' 'platforms;android-30' 'platforms;android-31'
@@ -54,5 +54,5 @@ WORKDIR /tmp
 RUN rm -rf deps
 RUN find $GRADLE_USER_HOME/daemon -exec chmod 777 {} \;
 
-# Install AppImage Builder
-RUN pip3 install appimage-builder
+# Install AppImage Builder and F-Droid Server
+RUN pip3 install appimage-builder fdroidserver
diff --git a/ci.py b/ci.py
index 295ec85c..a4ac9634 100755
--- a/ci.py
+++ b/ci.py
@@ -53,7 +53,7 @@ def sign_apk_standalone():
   podman_offline(f"{CONTAINER_HOME}/src",
                  "zipalign -f -v 4 build/app/outputs/flutter-apk/app-release.apk",
                  f"standalone_{APP_NAME}-{APP_SEMVER}.apk")
-  podman_offline(f"{CONTAINER_HOME}/fdroid",
+  podman_offline(f"{CONTAINER_HOME}/src",
                  "apksigner sign --ks ../fdroid/standalone-keystore --ks-key-alias standalone --ks-pass",
                  f"env:STANDALONE_KEYSTORE_PASS standalone_{APP_NAME}-{APP_SEMVER}.apk")