chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d9d11ba
)
Bump build-tools to 23.0.2
author
Daniel Martí
<mvdan@mvdan.cc>
Thu, 5 Nov 2015 10:55:19 +0000
(11:55 +0100)
committer
Daniel Martí
<mvdan@mvdan.cc>
Thu, 5 Nov 2015 10:56:13 +0000
(11:56 +0100)
.gitlab-ci.yml
patch
|
blob
|
history
buildserver/cookbooks/android-sdk/recipes/default.rb
patch
|
blob
|
history
examples/config.py
patch
|
blob
|
history
fdroidserver/common.py
patch
|
blob
|
history
diff --git
a/.gitlab-ci.yml
b/.gitlab-ci.yml
index 74ae03930d7cf459ed3fe7c9918165235f8bca27..a1b3148a073d97cb7dbd6ebc510af074194c029f 100644
(file)
--- a/
.gitlab-ci.yml
+++ b/
.gitlab-ci.yml
@@
-23,9
+23,9
@@
before_script:
- export ANDROID_HOME=$PWD/android-sdk
- export PATH="$ANDROID_HOME/tools:$PATH"
- echo " == Installing Android SDK components"
- export ANDROID_HOME=$PWD/android-sdk
- export PATH="$ANDROID_HOME/tools:$PATH"
- echo " == Installing Android SDK components"
- - echo y | android -s update sdk --no-ui -a -t platform-tools,tools,build-tools-23.0.
1
+ - echo y | android -s update sdk --no-ui -a -t platform-tools,tools,build-tools-23.0.
2
- export PATH="$ANDROID_HOME/platform-tools:$PATH"
- export PATH="$ANDROID_HOME/platform-tools:$PATH"
- - export PATH="$ANDROID_HOME/build-tools/23.0.
1
:$PATH"
+ - export PATH="$ANDROID_HOME/build-tools/23.0.
2
:$PATH"
test:
script:
test:
script:
diff --git
a/buildserver/cookbooks/android-sdk/recipes/default.rb
b/buildserver/cookbooks/android-sdk/recipes/default.rb
index ce187ea25b51a05ddfa38cb6674f13562360cdd7..42b8b9881d11c8c919e865301ca77bae6b70a9d2 100644
(file)
--- a/
buildserver/cookbooks/android-sdk/recipes/default.rb
+++ b/
buildserver/cookbooks/android-sdk/recipes/default.rb
@@
-26,7
+26,7
@@
end
script "add_build_tools" do
interpreter "bash"
user user
script "add_build_tools" do
interpreter "bash"
user user
- ver = "23.0.
1
"
+ ver = "23.0.
2
"
cwd "/tmp"
code "
if [ -f /vagrant/cache/build-tools/#{ver}.tar.gz ] ; then
cwd "/tmp"
code "
if [ -f /vagrant/cache/build-tools/#{ver}.tar.gz ] ; then
diff --git
a/examples/config.py
b/examples/config.py
index b72b18a128f460386924ace5224b7af7b4923f46..2aaaed1091988af457219d24c581c7fcf667a9f8 100644
(file)
--- a/
examples/config.py
+++ b/
examples/config.py
@@
-23,7
+23,7
@@
# }
# Build tools version to be used
# }
# Build tools version to be used
-# build_tools = "23.0.
1
"
+# build_tools = "23.0.
2
"
# Command or path to binary for running Ant
# ant = "ant"
# Command or path to binary for running Ant
# ant = "ant"
diff --git
a/fdroidserver/common.py
b/fdroidserver/common.py
index 2d44fc9c52748ae5584260be852cceebc80ad137..ce7e73283e03f5aeffa147d2a7ee30c4fcf363e5 100644
(file)
--- a/
fdroidserver/common.py
+++ b/
fdroidserver/common.py
@@
-56,7
+56,7
@@
default_config = {
'r9b': None,
'r10e': "$ANDROID_NDK",
},
'r9b': None,
'r10e': "$ANDROID_NDK",
},
- 'build_tools': "23.0.
1
",
+ 'build_tools': "23.0.
2
",
'java_paths': {
'1.7': "/usr/lib/jvm/java-7-openjdk",
'1.8': None,
'java_paths': {
'1.7': "/usr/lib/jvm/java-7-openjdk",
'1.8': None,