From 86c60aa4c2c290bece9a299cbce1204fb8cc3902 Mon Sep 17 00:00:00 2001 From: Alya Sirko Date: Fri, 9 Sep 2022 17:39:24 +0300 Subject: [PATCH] new podman-based pipeline --- .drone.yml | 6 ------ ci.sh | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3c603268..e7dac621 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,12 +23,6 @@ steps: commands: - ln -s /var/lib/drone-runner-exec/.local $HOME/.local - - name: Debug - commands: - - echo $HOME - - podman images - - ls -la - - name: Build Intermediate Linux Release Artifact (Binary) commands: - ./ci.sh --build-linux diff --git a/ci.sh b/ci.sh index 2efc95d1..582e6191 100755 --- a/ci.sh +++ b/ci.sh @@ -10,7 +10,7 @@ usage () { } podman_offline () { - podman run --rm -v "`pwd`:/var/lib/builder/src:U" -v "$HOME/fdroid:/var/lib/builder/repo:U" -v "$HOME/fdroid-keystore:/var/lib/builder/repo/fdroid-keystore:U" -v "$HOME/standalone-keystore:/var/lib/builder/repo/standalone-keystore:U" --env FDROID_KEYSTORE_PASS="$FDROID_KEYSTORE_PASS" --env STANDALONE_KEYSTORE_PASS="$STANDALONE_KEYSTORE_PASS" --network=none --workdir "$1" "$CONTAINER_IMAGE" "$2" + podman run --rm -v "`pwd`:/var/lib/builder/src:U" -v "/var/lib/drone-runner-exec/fdroid:/var/lib/builder/repo:U" -v "/var/lib/drone-runner-exec/fdroid-keystore:/var/lib/builder/repo/fdroid-keystore:U" -v "/var/lib/drone-runner-exec/standalone-keystore:/var/lib/builder/repo/standalone-keystore:U" --env FDROID_KEYSTORE_PASS="$FDROID_KEYSTORE_PASS" --env STANDALONE_KEYSTORE_PASS="$STANDALONE_KEYSTORE_PASS" --network=none --workdir "$1" "$CONTAINER_IMAGE" "$2" } podman_online () {