mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-11-14 02:50:12 +01:00
Merge branch 'updates' into 'master'
all: bump to build-tools 24.0.2 Update the docker image to include it there too. See merge request !163
This commit is contained in:
commit
9f88bc6324
@ -1,4 +1,4 @@
|
||||
image: mvdan/fdroid-ci:server-20160820
|
||||
image: mvdan/fdroid-ci:server-20160909
|
||||
|
||||
test:
|
||||
script:
|
||||
|
@ -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-24.0.1;
|
||||
echo y | android --verbose update sdk --no-ui --all --filter platform-tools,build-tools-24.0.2;
|
||||
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
||||
sudo add-apt-repository ppa:guardianproject/fdroidserver -y;
|
||||
sudo apt-get -q update -y;
|
||||
|
@ -22,7 +22,7 @@
|
||||
# }
|
||||
|
||||
# Build tools version to be used
|
||||
# build_tools = "24.0.1"
|
||||
# build_tools = "24.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.
|
||||
|
@ -60,7 +60,7 @@ default_config = {
|
||||
'r11c': None,
|
||||
'r12b': "$ANDROID_NDK",
|
||||
},
|
||||
'build_tools': "24.0.1",
|
||||
'build_tools': "24.0.2",
|
||||
'force_build_tools': False,
|
||||
'java_paths': None,
|
||||
'ant': "ant",
|
||||
|
Loading…
Reference in New Issue
Block a user