kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-14 11:00:10 +01:00
Code Activity

Merge branch 'fix-ci' into 'master'

Browse Source 
CI: Install venv instead of virtualenv



See merge request !122
This commit is contained in:
Daniel Martí 2016-04-15 10:30:24 +00:00
commit a2edc9da43
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -1,4 +1,4 @@
image: mvdan/fdroid-ci:base-20160405 image: mvdan/fdroid-ci:base-20160414
test: test:
script: script:

2
.travis.yml
View File

@ -34,7 +34,7 @@ install:
sudo apt-get -q install -y --no-install-recommends python3 python3-dev sudo apt-get -q install -y --no-install-recommends python3 python3-dev
python3-git python3-pil python3-libcloud python3-logilab-astng python3-git python3-pil python3-libcloud python3-logilab-astng
python3-paramiko python3-pip python3-pyasn1 python3-pyasn1-modules python3-paramiko python3-pip python3-pyasn1 python3-pyasn1-modules
python3-requests python3-virtualenv python3-yaml rsync python3-requests python3-venv python3-yaml rsync
pyflakes pylint3 pep8 dash bash ruby libjpeg-dev zlib1g-dev; pyflakes pylint3 pep8 dash bash ruby libjpeg-dev zlib1g-dev;
sudo pip3 install pylint; sudo pip3 install pylint;
fi fi

2
buildserver/cookbooks/gradle/recipes/default.rb
View File

@ -18,7 +18,7 @@ script "add-gradle-verdir" do
not_if "test -d /opt/gradle/versions" not_if "test -d /opt/gradle/versions"
end end
%w{1.4 1.6 1.7 1.8 1.9 1.10 1.11 1.12 2.1 2.2.1 2.3 2.4 2.5 2.6 2.7 2.8 2.9 2.10 2.11}.each do |ver| %w{1.4 1.6 1.7 1.8 1.9 1.10 1.11 1.12 2.1 2.2.1 2.3 2.4 2.5 2.6 2.7 2.8 2.9 2.10 2.11 2.12}.each do |ver|
script "install-gradle-#{ver}" do script "install-gradle-#{ver}" do
cwd "/tmp" cwd "/tmp"
interpreter "bash" interpreter "bash"