From ee79942198fc773a9fee50d2180c1d7ab72b3e82 Mon Sep 17 00:00:00 2001 From: Alya Sirko Date: Fri, 9 Sep 2022 18:40:11 +0300 Subject: [PATCH] new podman-based pipeline --- .drone.yml | 5 +++-- ci.sh | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index c97e3f3a..93a371a3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -22,10 +22,11 @@ steps: - name: Prepare commands: - ln -s /var/lib/drone-runner-exec/.local $HOME/.local + - podman unshare chown -R 999:999 . - name: Build Intermediate Linux Release Artifact (Binary) commands: - - podman unshare ./ci.sh --build-linux + - ./ci.sh --build-linux environment: STANDALONE_KEYSTORE_PASS: from_secret: STANDALONE_KEYSTORE_PASS @@ -34,7 +35,7 @@ steps: - name: Build Intermediate Android Release Artifact (.APK) commands: - - podman unshare ./ci.sh --build-apk + - ./ci.sh --build-apk environment: STANDALONE_KEYSTORE_PASS: from_secret: STANDALONE_KEYSTORE_PASS diff --git a/ci.sh b/ci.sh index 5b038e07..fad78072 100755 --- a/ci.sh +++ b/ci.sh @@ -10,11 +10,11 @@ usage () { } podman_offline () { - 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 run --rm -v "`pwd`:/var/lib/builder/src" -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 () { - podman run --rm -v "`pwd`:/var/lib/builder/src:U" --privileged --workdir $1 "$CONTAINER_IMAGE" $2 + podman run --rm -v "`pwd`:/var/lib/builder/src" --privileged --workdir $1 "$CONTAINER_IMAGE" $2 } build_linux () {