From 26a04c404f8ceb96ff9cf5bc602016285e479ed7 Mon Sep 17 00:00:00 2001
From: proletarius101 <proletarius101@protonmail.com>
Date: Thu, 1 Apr 2021 10:46:15 +0000
Subject: [PATCH] Run fdroid build as non-root user

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e7d84686b5..c966401482 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -187,6 +187,7 @@ fdroid build:
 
     - bash fdroidserver/buildserver/setup-env-vars $ANDROID_HOME
     - adduser --disabled-password --gecos "" vagrant
+    - echo "vagrant ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/vagrant
     - ln -s $CI_PROJECT_DIR/fdroidserver /home/vagrant/fdroidserver
     - mkdir -p /vagrant/cache
     - wget -q https://services.gradle.org/distributions/gradle-5.6.2-bin.zip
@@ -212,7 +213,7 @@ fdroid build:
           apt-get install sudo;
           ./tools/setup-ndk-per-build.py $build /home/vagrant/android-ndk;
           fdroid fetchsrclibs $build --verbose;
-          fdroid build --verbose --scan-binary --on-server --no-tarball $build;
+          sudo -E --user vagrant fdroid build --verbose --scan-binary --on-server --no-tarball $build;
       done