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

Bump ci images and default build-tools

Browse Source
This commit is contained in:
Daniel Martí 2016-10-23 16:58:37 +01:00
parent 98b7538789
commit 148f077ad8
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: mvdan/fdroid-ci:server-20160909 image: fdroid/ci:server-20161023
test: test:
script: script:

2
.travis.yml
View File

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

2
examples/config.py
View File

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

2
fdroidserver/common.py
View File

@ -61,7 +61,7 @@ default_config = {
'r12b': "$ANDROID_NDK", 'r12b': "$ANDROID_NDK",
}, },
'qt_sdk_path': None, 'qt_sdk_path': None,
'build_tools': "24.0.2", 'build_tools': "25.0.0",
'force_build_tools': False, 'force_build_tools': False,
'java_paths': None, 'java_paths': None,
'ant': "ant", 'ant': "ant",