1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-07-04 16:30:12 +02:00

buildserver: use pip instead of easy_install for caching

easy_install does not provide any download caching, while pip does. This
also moves the python module installing a shell script that takes python
packages as args.  That will allow for future uses like allowing app
metadata to include pip modules that they need.
This commit is contained in:
Hans-Christoph Steiner 2016-07-04 14:08:54 +02:00
parent aafad6b909
commit 0171dd60fd
3 changed files with 15 additions and 6 deletions

View File

@ -1,5 +0,0 @@
easy_install_package "compare-locales" do
options "-U"
action :install
end

13
buildserver/provision-pip Normal file
View File

@ -0,0 +1,13 @@
#!/bin/bash
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 $@

View File

@ -383,13 +383,14 @@ vagrantfile += """
config.vm.provision :chef_solo do |chef|
chef.cookbooks_path = "cookbooks"
chef.log_level = :debug
chef.add_recipe "fdroidbuild-general"
chef.add_recipe "kivy"
end
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"
config.vm.provision "file", source: "gradle",
destination: "/opt/gradle/bin/gradle"