1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-20 13:50:12 +01:00

Merge branch 'makebuildserver_improvements' into 'master'

Makebuildserver improvements

Closes #591

See merge request fdroid/fdroidserver!598
This commit is contained in:
Hans-Christoph Steiner 2018-11-27 16:02:38 +00:00
commit dcc9ada1d1
3 changed files with 4 additions and 30 deletions

View File

@ -80,8 +80,6 @@ Vagrant.configure("2") do |config|
config.vm.provision "shell", path: "provision-android-sdk" config.vm.provision "shell", path: "provision-android-sdk"
config.vm.provision "shell", path: "provision-android-ndk", config.vm.provision "shell", path: "provision-android-ndk",
args: ["/home/vagrant/android-ndk"] args: ["/home/vagrant/android-ndk"]
config.vm.provision "shell", path: "provision-pip",
args: ["compare-locales"]
config.vm.provision "shell", path: "provision-gradle" config.vm.provision "shell", path: "provision-gradle"
end end

View File

@ -5,6 +5,7 @@ set -e
set -x set -x
debian_mirror=$1 debian_mirror=$1
export DEBIAN_FRONTEND=noninteractive
printf 'APT::Install-Recommends "0";\nAPT::Install-Suggests "0";\n' \ printf 'APT::Install-Recommends "0";\nAPT::Install-Suggests "0";\n' \
> /etc/apt/apt.conf.d/99no-install-recommends > /etc/apt/apt.conf.d/99no-install-recommends
@ -41,7 +42,7 @@ packages="
ant-contrib ant-contrib
autoconf autoconf
autoconf2.13 autoconf2.13
automake/testing automake
automake1.11 automake1.11
autopoint autopoint
bison bison
@ -57,34 +58,27 @@ packages="
git-core git-core
git-svn git-svn
gperf gperf
graphviz
imagemagick
inkscape
javacc javacc
libarchive-zip-perl libarchive-zip-perl
libexpat1-dev libexpat1-dev
libgcc1:i386 libgcc1:i386
libglib2.0-dev libglib2.0-dev
liblwp-protocol-https-perl
liblzma-dev liblzma-dev
libncurses5:i386 libncurses5:i386
librsvg2-bin librsvg2-bin
libsaxonb-java libsaxonb-java
libssl-dev libssl-dev
libstdc++6:i386 libstdc++6:i386
libtool/testing libtool
libtool-bin/testing libtool-bin
make make
maven maven
mercurial mercurial
nasm nasm
nodejs
openjdk-8-jre-headless openjdk-8-jre-headless
openjdk-8-jdk-headless openjdk-8-jdk-headless
optipng optipng
p7zip p7zip
pandoc
perlmagick
pkg-config pkg-config
python-gnupg python-gnupg
python-lxml python-lxml
@ -104,16 +98,12 @@ packages="
python3-yaml python3-yaml
python3-ruamel.yaml python3-ruamel.yaml
quilt quilt
realpath
rsync rsync
scons scons
sqlite3 sqlite3
subversion subversion
swig swig
texinfo
transfig
unzip unzip
vorbis-tools
xsltproc xsltproc
yasm yasm
zip zip

View File

@ -1,14 +0,0 @@
#!/bin/bash
echo $0
set -e
set -x
# cache pypi downloads
if [ -z $PIP_DOWNLOAD_CACHE ]; then
export PIP_DOWNLOAD_CACHE=$HOME/.pip_download_cache
fi
apt-get install --yes --no-install-recommends python-pip
pip install --upgrade $@