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

Merge branch 'ci-update' into 'master'

Browse Source 
Bump CI image, now with build-tools 25.0.2

See merge request !197
This commit is contained in:
Daniel Martí 2016-12-23 17:22:35 +00:00
commit e1a1eada11
4 changed files with 4 additions and 4 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: fdroid/ci:server-20161031
image: fdroid/ci:server-20161223
test:
script:

2
.travis.yml
View File

@ -28,7 +28,7 @@ install:
sudo pip3 install pep8 pyflakes pylint;
sudo pip3 install -e .;
sudo rm -rf fdroidserver.egg-info;
echo y | android --verbose update sdk --no-ui --all --filter platform-tools,build-tools-25.0.0;
echo y | android --verbose update sdk --no-ui --all --filter platform-tools,build-tools-25.0.2;
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
sudo add-apt-repository ppa:guardianproject/fdroidserver -y;
sudo apt-get -q update -y;

2
examples/config.py
View File

@ -26,7 +26,7 @@
# }
# Build tools version to be used
# build_tools = "25.0.0"
# build_tools = "25.0.2"
# Force all build to use the above version of build -tools, good for testing
# builds without having all of the possible build-tools installed.

2
fdroidserver/common.py
View File

@ -62,7 +62,7 @@ default_config = {
'r13b': None,
},
'qt_sdk_path': None,
'build_tools': "25.0.0",
'build_tools': "25.0.2",
'force_build_tools': False,
'java_paths': None,
'ant': "ant",