basebox config

[fdroidserver.git] / makebuildserver

diff --git a/makebuildserver b/makebuildserver
index 20cc386c0f32886897b5c9a2690ce2b9d8d8eb21..691526e12cbd2b8beb566307309c631656f4db40 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -351,6 +351,10 @@ cachefiles = [
      '03f2a43a314ff0fb843a85ef68078e06d181c4549c1e5fb983f289382b59b5e3'),
     ('https://downloads.gradle.org/distributions/gradle-4.5.1-bin.zip',
      '3e2ea0d8b96605b7c528768f646e0975bd9822f06df1f04a64fd279b1a17805e'),
+    ('https://downloads.gradle.org/distributions/gradle-4.6-bin.zip',
+     '98bd5fd2b30e070517e03c51cbb32beee3e2ee1a84003a5a5d748996d4b1b915'),
+    ('https://downloads.gradle.org/distributions/gradle-4.7-bin.zip',
+     'fca5087dc8b50c64655c000989635664a73b11b9bd3703c7d6cabd31b7dcdb04'),
     ('https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin',
      '102d6723f67ff1384330d12c45854315d6452d6510286f4e5891e00a5a8f1d5a'),
     ('https://dl.google.com/android/repository/android-ndk-r11c-linux-x86_64.zip',
@@ -523,6 +527,7 @@ def main():
             if box.name == config['basebox']:
                 found_basebox = True
                 if box.provider != 'libvirt':
+                    logger.info('NEED TO MUTATE %s %s' % (box.name, box.provider))
                     needs_mutate = True
                 continue
         if not found_basebox:
@@ -532,7 +537,7 @@ def main():
                 baseboxurl = config['baseboxurl'][0]
             logger.info('Adding %s from %s', config['basebox'], baseboxurl)
             v.box_add(config['basebox'], baseboxurl)
-            needs_mutate = True
+            #needs_mutate = True
         if needs_mutate:
             logger.info('Converting %s to libvirt format', config['basebox'])
             v._call_vagrant_command(['mutate', config['basebox'], 'libvirt'])