mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-14 23:12:46 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bump build-tools

Browse source
This commit is contained in:
Daniel Martí 2015-09-05 22:59:35 -04:00
parent f4e96cfd7a
commit 41443edd55
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -23,9 +23,9 @@ before_script:
- export ANDROID_HOME=$PWD/android-sdk - export ANDROID_HOME=$PWD/android-sdk
- export PATH="$ANDROID_HOME/tools:$PATH" - export PATH="$ANDROID_HOME/tools:$PATH"
- echo " == Installing Android SDK components" - echo " == Installing Android SDK components"
- echo y | android -s update sdk --no-ui -a -t platform-tools,tools,build-tools-23.0.0 - echo y | android -s update sdk --no-ui -a -t platform-tools,tools,build-tools-23.0.1
- export PATH="$ANDROID_HOME/platform-tools:$PATH" - export PATH="$ANDROID_HOME/platform-tools:$PATH"
- export PATH="$ANDROID_HOME/build-tools/23.0.0:$PATH" - export PATH="$ANDROID_HOME/build-tools/23.0.1:$PATH"
test: test:
script: script:

2
buildserver/cookbooks/android-sdk/recipes/default.rb
View file

@ -26,7 +26,7 @@ end
script "add_build_tools" do script "add_build_tools" do
interpreter "bash" interpreter "bash"
user user user user
ver = "23.0.0" ver = "23.0.1"
cwd "/tmp" cwd "/tmp"
code " code "
if [ -f /vagrant/cache/build-tools/#{ver}.tar.gz ] ; then if [ -f /vagrant/cache/build-tools/#{ver}.tar.gz ] ; then

2
examples/config.py
View file

@ -16,7 +16,7 @@
# } # }
# Build tools version to be used # Build tools version to be used
build_tools = "23.0.0" build_tools = "23.0.1"
# Command or path to binary for running Ant # Command or path to binary for running Ant
ant = "ant" ant = "ant"

2
fdroidserver/common.py
View file

@ -55,7 +55,7 @@ default_config = {
'r9b': None, 'r9b': None,
'r10e': "$ANDROID_NDK", 'r10e': "$ANDROID_NDK",
}, },
'build_tools': "23.0.0", 'build_tools': "23.0.1",
'ant': "ant", 'ant': "ant",
'mvn3': "mvn", 'mvn3': "mvn",
'gradle': 'gradle', 'gradle': 'gradle',