From 1d8d6a43dcc8f8e67da8d61682556ecefa122729 Mon Sep 17 00:00:00 2001
From: Alya Sirko <alya@selfprivacy.org>
Date: Fri, 9 Sep 2022 18:33:44 +0300
Subject: [PATCH] Revert "new podman-based pipeline"

This reverts commit d4fa2edf23258096984f993f982b162eda384149.
---
 .drone.yml | 92 +++++++++++++++++++++++++-----------------------------
 ci.sh      | 14 ++-------
 2 files changed, 46 insertions(+), 60 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 1e4dc246..fe00f4ac 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -23,65 +23,59 @@ steps:
     commands:
       - ln -s /var/lib/drone-runner-exec/.local $HOME/.local
 
-  - name: Test 1
+  - name: Build Intermediate Linux Release Artifact (Binary)
     commands:
-      - ./ci.sh --test
+      - bash ci.sh --build-linux
+    environment:
+      STANDALONE_KEYSTORE_PASS:
+        from_secret: STANDALONE_KEYSTORE_PASS
+      FDROID_KEYSTORE_PASS:
+        from_secret: FDROID_KEYSTORE_PASS
 
-  - name: Test 2
+  - name: Debug
     commands:
-      - ./ci.sh --test2
+      - ls -la
+      - cat ci.sh
+      - bash ci.sh
 
-  - name: Test 3
+  - name: Build Intermediate Android Release Artifact (.APK)
     commands:
-      - ./ci.sh --test3
+      - bash ci.sh --build-apk
+    environment:
+      STANDALONE_KEYSTORE_PASS:
+        from_secret: STANDALONE_KEYSTORE_PASS
+      FDROID_KEYSTORE_PASS:
+        from_secret: FDROID_KEYSTORE_PASS
 
-#  - name: Build Intermediate Linux Release Artifact (Binary)
-#    commands:
-#      - bash ci.sh --build-linux
-#    environment:
-#      STANDALONE_KEYSTORE_PASS:
-#        from_secret: STANDALONE_KEYSTORE_PASS
-#      FDROID_KEYSTORE_PASS:
-#        from_secret: FDROID_KEYSTORE_PASS
+  - name: Sign Android Release Artifact (.APK) for Standalone Use
+    commands:
+      - ./ci.sh --sign-apk-standalone
+    environment:
+      STANDALONE_KEYSTORE_PASS:
+        from_secret: STANDALONE_KEYSTORE_PASS
+      FDROID_KEYSTORE_PASS:
+        from_secret: FDROID_KEYSTORE_PASS
 
-#  - name: Build Intermediate Android Release Artifact (.APK)
-#    commands:
-#      - bash ci.sh --build-apk
-#    environment:
-#      STANDALONE_KEYSTORE_PASS:
-#        from_secret: STANDALONE_KEYSTORE_PASS
-#      FDROID_KEYSTORE_PASS:
-#        from_secret: FDROID_KEYSTORE_PASS
+  - name: Sign Android Release Artifact (.APK) for F-Droid Repository
+    commands:
+      - ./ci.sh --sign-apk-fdroid
+    environment:
+      STANDALONE_KEYSTORE_PASS:
+        from_secret: STANDALONE_KEYSTORE_PASS
+      FDROID_KEYSTORE_PASS:
+        from_secret: FDROID_KEYSTORE_PASS
 
-#  - name: Sign Android Release Artifact (.APK) for Standalone Use
-#    commands:
-#      - ./ci.sh --sign-apk-standalone
-#    environment:
-#      STANDALONE_KEYSTORE_PASS:
-#        from_secret: STANDALONE_KEYSTORE_PASS
-#      FDROID_KEYSTORE_PASS:
-#        from_secret: FDROID_KEYSTORE_PASS
+  - name: Package Linux AppImage Artifact
+    commands:
+      - ./ci.sh --package-linux-appimage
 
-#  - name: Sign Android Release Artifact (.APK) for F-Droid Repository
-#    commands:
-#      - ./ci.sh --sign-apk-fdroid
-#    environment:
-#      STANDALONE_KEYSTORE_PASS:
-#        from_secret: STANDALONE_KEYSTORE_PASS
-#      FDROID_KEYSTORE_PASS:
-#        from_secret: FDROID_KEYSTORE_PASS
+  - name: Package Linux Flatpak Artifact
+    commands:
+      - ./ci.sh --package-linux-flatpak
 
-#  - name: Package Linux AppImage Artifact
-#    commands:
-#      - ./ci.sh --package-linux-appimage
-
-#  - name: Package Linux Flatpak Artifact
-#    commands:
-#      - ./ci.sh --package-linux-flatpak
-
-#  - name: Package Linux Archive Artifact
-#    commands:
-#      - ./ci.sh --package-linux-archive
+  - name: Package Linux Archive Artifact
+    commands:
+      - ./ci.sh --package-linux-archive
 
 trigger:
   event:
diff --git a/ci.sh b/ci.sh
index c0ab269e..5b038e07 100755
--- a/ci.sh
+++ b/ci.sh
@@ -2,7 +2,7 @@
 set -o errexit -o pipefail -o noclobber -o nounset -x
 
 CONTAINER_IMAGE="localhost/flutter-build-env"
-OPTS=$(getopt -o "" --long "test,test2,test3,build-linux,build-apk,sign-apk-standalone,sign-apk-fdroid,package-linux-appimage,package-linux-flatpak,package-linux-archive" -- "$@")
+OPTS=$(getopt -o "" --long "build-linux,build-apk,sign-apk-standalone,sign-apk-fdroid,package-linux-appimage,package-linux-flatpak,package-linux-archive" -- "$@")
 eval set -- "$OPTS"
 
 usage () {
@@ -52,16 +52,8 @@ package_linux_archive () {
 
 while true; do
   case "$1" in
-    --test )
-      echo 1
-      shift
-      ;;
-    --test2 )
-      echo 2
-      shift
-      ;;
-    --test3 )
-      echo 3
+    --build-linux )
+      build_linux
       shift
       ;;
     --build-apk )