mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-03 17:50:11 +02:00
Merge branch 'makebuildserver_improvements' into 'master'
Makebuildserver improvements Closes #591 See merge request fdroid/fdroidserver!598
This commit is contained in:
commit
dcc9ada1d1
2
buildserver/Vagrantfile
vendored
2
buildserver/Vagrantfile
vendored
@ -80,8 +80,6 @@ Vagrant.configure("2") do |config|
|
||||
config.vm.provision "shell", path: "provision-android-sdk"
|
||||
config.vm.provision "shell", path: "provision-android-ndk",
|
||||
args: ["/home/vagrant/android-ndk"]
|
||||
config.vm.provision "shell", path: "provision-pip",
|
||||
args: ["compare-locales"]
|
||||
config.vm.provision "shell", path: "provision-gradle"
|
||||
|
||||
end
|
||||
|
@ -5,6 +5,7 @@ set -e
|
||||
set -x
|
||||
|
||||
debian_mirror=$1
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
printf 'APT::Install-Recommends "0";\nAPT::Install-Suggests "0";\n' \
|
||||
> /etc/apt/apt.conf.d/99no-install-recommends
|
||||
@ -41,7 +42,7 @@ packages="
|
||||
ant-contrib
|
||||
autoconf
|
||||
autoconf2.13
|
||||
automake/testing
|
||||
automake
|
||||
automake1.11
|
||||
autopoint
|
||||
bison
|
||||
@ -57,34 +58,27 @@ packages="
|
||||
git-core
|
||||
git-svn
|
||||
gperf
|
||||
graphviz
|
||||
imagemagick
|
||||
inkscape
|
||||
javacc
|
||||
libarchive-zip-perl
|
||||
libexpat1-dev
|
||||
libgcc1:i386
|
||||
libglib2.0-dev
|
||||
liblwp-protocol-https-perl
|
||||
liblzma-dev
|
||||
libncurses5:i386
|
||||
librsvg2-bin
|
||||
libsaxonb-java
|
||||
libssl-dev
|
||||
libstdc++6:i386
|
||||
libtool/testing
|
||||
libtool-bin/testing
|
||||
libtool
|
||||
libtool-bin
|
||||
make
|
||||
maven
|
||||
mercurial
|
||||
nasm
|
||||
nodejs
|
||||
openjdk-8-jre-headless
|
||||
openjdk-8-jdk-headless
|
||||
optipng
|
||||
p7zip
|
||||
pandoc
|
||||
perlmagick
|
||||
pkg-config
|
||||
python-gnupg
|
||||
python-lxml
|
||||
@ -104,16 +98,12 @@ packages="
|
||||
python3-yaml
|
||||
python3-ruamel.yaml
|
||||
quilt
|
||||
realpath
|
||||
rsync
|
||||
scons
|
||||
sqlite3
|
||||
subversion
|
||||
swig
|
||||
texinfo
|
||||
transfig
|
||||
unzip
|
||||
vorbis-tools
|
||||
xsltproc
|
||||
yasm
|
||||
zip
|
||||
|
@ -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 $@
|
Loading…
Reference in New Issue
Block a user