From 672fcf7b76552388e5485004cf9753fc53c75c97 Mon Sep 17 00:00:00 2001 From: Alya Sirko Date: Wed, 14 Sep 2022 16:25:33 +0300 Subject: [PATCH] Better CI --- ci.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci.py b/ci.py index b00562e9..9723bd9d 100755 --- a/ci.py +++ b/ci.py @@ -26,14 +26,14 @@ def podman_offline(dir, *args): "-v", f"{HOST_HOME}/standalone-keystore:{CONTAINER_HOME}/fdroid/standalone-keystore", "--env", "FDROID_KEYSTORE_PASS=" + os.environ.get('FDROID_KEYSTORE_PASS'), "--env", "STANDALONE_KEYSTORE_PASS=" + os.environ.get('STANDALONE_KEYSTORE_PASS'), - "--user", os.getuid() + ":" + os.getgid(), "--userns=keep-id", + "--user", os.getuid().__str__() + ":" + os.getgid().__str__(), "--userns=keep-id", CONTAINER_IMAGE, "bash", "-c", ' '.join(args) ]) def podman_online(dir, *args): subprocess.run(["podman", "run", "--rm", "--privileged", f"--workdir={dir}", "-v", os.getcwd() + f":{CONTAINER_HOME}/src", - "--user", os.getuid() + ":" + os.getgid(), "--userns=keep-id", + "--user", os.getuid().__str__() + ":" + os.getgid().__str__(), "--userns=keep-id", CONTAINER_IMAGE, "bash", "-c", ' '.join(args) ])