Merge branch 'revertsudothing' into 'master'

Revert 8655

See merge request fdroid/fdroiddata!8725
This commit is contained in:
Licaon_Kter 2021-04-01 13:55:53 +00:00
commit 6fd119b7ff

View file

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