Merge branch 'support-vagrant-cachier' into 'master'

[fdroidserver.git] / makebuildserver

diff --git a/makebuildserver b/makebuildserver
index 60533e3f2acd544792699bf506cc02c34fe848cc..5b4862f31bf3ddd13020196ad5b609b48d2fbb4f 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -62,9 +62,9 @@ if not os.path.exists(cachedir):
     os.mkdir(cachedir)
 
 cachefiles = [
-    ('android-sdk_r24.1.2-linux.tgz',
-     'https://dl.google.com/android/android-sdk_r24.1.2-linux.tgz',
-     '77dc2e98cf64a04d13d9554ec6ac8ad26a8b32d49119ae8af15348e715674f8e'),
+    ('android-sdk_r24.3.4-linux.tgz',
+     'https://dl.google.com/android/android-sdk_r24.3.4-linux.tgz',
+     '886412375d8fe6e49a1583e57a8a36a47943666da681701ba9ad1ab7236e83ea'),
     ('gradle-1.4-bin.zip',
      'https://services.gradle.org/distributions/gradle-1.4-bin.zip',
      'cd99e85fbcd0ae8b99e81c9992a2f10cceb7b5f009c3720ef3a0078f4f92e94e'),
@@ -98,6 +98,15 @@ cachefiles = [
     ('gradle-2.3-bin.zip',
      'https://services.gradle.org/distributions/gradle-2.3-bin.zip',
      '010dd9f31849abc3d5644e282943b1c1c355f8e2635c5789833979ce590a3774'),
+    ('gradle-2.4-bin.zip',
+     'https://services.gradle.org/distributions/gradle-2.4-bin.zip',
+     'c4eaecc621a81f567ded1aede4a5ddb281cc02a03a6a87c4f5502add8fc2f16f'),
+    ('gradle-2.5-bin.zip',
+     'https://services.gradle.org/distributions/gradle-2.5-bin.zip',
+     '3f953e0cb14bb3f9ebbe11946e84071547bf5dfd575d90cfe9cc4e788da38555'),
+    ('gradle-2.6-bin.zip',
+     'https://services.gradle.org/distributions/gradle-2.6-bin.zip',
+     '18a98c560af231dfa0d3f8e0802c20103ae986f12428bb0a6f5396e8f14e9c83'),
     ('Kivy-1.7.2.tar.gz',
      'https://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz',
      '0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1'),
@@ -105,9 +114,9 @@ cachefiles = [
 
 if config['arch64']:
     cachefiles.extend([
-        ('android-ndk-r10d-linux-x86_64.bin',
-         'https://dl.google.com/android/ndk/android-ndk-r10d-linux-x86_64.bin',
-         '812949f9299afd4b91890863054dc42f6547b6d485211d5f0faca9f286685df6'),
+        ('android-ndk-r10e-linux-x86_64.bin',
+         'https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin',
+         '102d6723f67ff1384330d12c45854315d6452d6510286f4e5891e00a5a8f1d5a'),
         ('android-ndk-r9b-linux-x86_64.tar.bz2',
          'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2',
          '8956e9efeea95f49425ded8bb697013b66e162b064b0f66b5c75628f76e0f532'),
@@ -116,9 +125,9 @@ if config['arch64']:
          'de93a394f7c8f3436db44568648f87738a8d09801a52f459dcad3fc047e045a1')])
 else:
     cachefiles.extend([
-        ('android-ndk-r10d-linux-x86.bin',
-         'https://dl.google.com/android/ndk/android-ndk-r10d-linux-x86.bin',
-         'c0d07e5ce2fff13b5eb456c10e99527184c9139e798cb7fd1adfadafa65cb696'),
+        ('android-ndk-r10e-linux-x86.bin',
+         'https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86.bin',
+         '92b07d25aaad9b341a7f2b2a62402d508e948bf2dea3ee7b65a6aeb18bca7df5'),
         ('android-ndk-r9b-linux-x86.tar.bz2',
          'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86.tar.bz2',
          '748104b829dd12afb2fdb3044634963abb24cdb0aad3b26030abe2e9e65bfc81'),
@@ -161,6 +170,13 @@ for f, src, shasum in cachefiles:
 vagrantfile = """
 Vagrant.configure("2") do |config|
 
+  if Vagrant.has_plugin?("vagrant-cachier")
+    config.cache.scope = :box
+    config.cache.auto_detect = false
+    config.cache.enable :apt
+    config.cache.enable :chef
+  end
+
   config.vm.box = "{0}"
   config.vm.box_url = "{1}"