update: make icon extraction less dependent on aapt

[fdroidserver.git] / makebuildserver

diff --git a/makebuildserver b/makebuildserver
index 8484e63a761970748846f4336c6062b1073d77d3..20cc386c0f32886897b5c9a2690ce2b9d8d8eb21 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -58,8 +58,7 @@ logger.debug('cachedir set to: %s', cachedir)
 config = {
     'basebox': 'jessie64',
     'baseboxurl': [
-        pathlib.Path(os.path.join(cachedir, 'jessie64.box')).as_uri(),
-        'https://f-droid.org/jessie64.box',
+        pathlib.Path(os.path.join(cachedir, 'jessie64.box')).as_uri()
     ],
     'debian_mirror': 'http://http.debian.net/debian/',
     'apt_package_cache': False,
@@ -67,7 +66,7 @@ config = {
     'boot_timeout': 600,
     'cachedir': cachedir,
     'cpus': 1,
-    'memory': 1024,
+    'memory': 2048,
     'hwvirtex': 'off',
     'vm_provider': 'virtualbox',
 }
@@ -179,6 +178,11 @@ cachefiles = [
      '9b742d34590fe73fb7229e34835ecffb1846ca389d9f924f0b2a37de525dc6b8'),
     ('https://dl.google.com/android/repository/platform-26_r02.zip',
      '2aafa7d19c5e9c4b643ee6ade3d85ef89dc2f79e8383efdb9baf7fddad74b52a'),
+    # Download platform-27 from F-Droid's server because google has two different files for that filename.
+    # For reproducibility and general sanity we chose the newer one from Nov 17.
+    # For reference the older one from Nov 8 has a sha256sum of cbba6f8fcf025e1b533326746763aa1d6e2cf4001b1b441602bb44d253bc49ac
+    ('https://verification.f-droid.org/build-metadata/96ddff1a5034fcc4340f2d482635eeaccaa6707b6b0f82d26d1435476a2f52e5/platform-27_r01.zip',
+     '96ddff1a5034fcc4340f2d482635eeaccaa6707b6b0f82d26d1435476a2f52e5'),
     ('https://dl.google.com/android/repository/build-tools_r17-linux.zip',
      '4c8444972343a19045236f6924bd7f12046287c70dace96ab88b2159c8ec0e74'),
     ('https://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip',
@@ -245,6 +249,16 @@ cachefiles = [
      'c8617f25a7de2aeb9ddcacf1aeb413e053d5ed5ef4a3f31fe0ce21d4428ee0ea'),
     ('https://dl.google.com/android/repository/build-tools_r26.0.2-linux.zip',
      'a752849fac85c4a7f9ea165ec8f367b0ebe8bbf6a1f33fc8605342be004231ce'),
+    ('https://dl.google.com/android/repository/build-tools_r26.0.3-linux.zip',
+     '5c250c602b1657c4c70a6078925e9e01e5714526b707309bc1c708be6137a4db'),
+    ('https://dl.google.com/android/repository/build-tools_r27-linux.zip',
+     '53d3322774a0bf229b372c0288108b4bfa27d74725fce8f0a3393e8df6b9ef22'),
+    ('https://dl.google.com/android/repository/build-tools_r27.0.1-linux.zip',
+     '2e8e0946e93af50667ae02ef200e81c1ac2269b59f14955397245e9e441e8b1e'),
+    ('https://dl.google.com/android/repository/build-tools_r27.0.2-linux.zip',
+     'e73674e065a93ffb05c30a15c8021c0d72ea7c3c206eb9020eb93e49e42ce851'),
+    ('https://dl.google.com/android/repository/build-tools_r27.0.3-linux.zip',
+     '5e1f4fc5203f13de120c56f9cc103bb2e57d940959547506196ab10ddc9e6b97'),
     # the binaries that Google uses are here:
     # https://android.googlesource.com/platform/tools/external/gradle/+/studio-1.5/
     ('https://services.gradle.org/distributions/gradle-1.4-bin.zip',
@@ -323,12 +337,22 @@ cachefiles = [
      'd55dfa9cfb5a3da86a1c9e75bb0b9507f9a8c8c100793ccec7beb6e259f9ed43'),
     ('https://services.gradle.org/distributions/gradle-4.2-bin.zip',
      '515dd63d32e55a9c05667809c5e40a947529de3054444ad274b3b75af5582eae'),
+    ('https://downloads.gradle.org/distributions/gradle-4.2.1-bin.zip',
+     'b551cc04f2ca51c78dd14edb060621f0e5439bdfafa6fd167032a09ac708fbc0'),
+    ('https://downloads.gradle.org/distributions/gradle-4.3-bin.zip',
+     '8dcbf44eef92575b475dcb1ce12b5f19d38dc79e84c662670248dc8b8247654c'),
+    ('https://downloads.gradle.org/distributions/gradle-4.3.1-bin.zip',
+     '15ebe098ce0392a2d06d252bff24143cc88c4e963346582c8d88814758d93ac7'),
+    ('https://downloads.gradle.org/distributions/gradle-4.4-bin.zip',
+     'fa4873ae2c7f5e8c02ec6948ba95848cedced6134772a0169718eadcb39e0a2f'),
+    ('https://downloads.gradle.org/distributions/gradle-4.4.1-bin.zip',
+     'e7cf7d1853dfc30c1c44f571d3919eeeedef002823b66b6a988d27e919686389'),
+    ('https://downloads.gradle.org/distributions/gradle-4.5-bin.zip',
+     '03f2a43a314ff0fb843a85ef68078e06d181c4549c1e5fb983f289382b59b5e3'),
+    ('https://downloads.gradle.org/distributions/gradle-4.5.1-bin.zip',
+     '3e2ea0d8b96605b7c528768f646e0975bd9822f06df1f04a64fd279b1a17805e'),
     ('https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin',
      '102d6723f67ff1384330d12c45854315d6452d6510286f4e5891e00a5a8f1d5a'),
-    ('https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2',
-     '8956e9efeea95f49425ded8bb697013b66e162b064b0f66b5c75628f76e0f532'),
-    ('https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2',
-     'de93a394f7c8f3436db44568648f87738a8d09801a52f459dcad3fc047e045a1'),
     ('https://dl.google.com/android/repository/android-ndk-r11c-linux-x86_64.zip',
      'ba85dbe4d370e4de567222f73a3e034d85fc3011b3cbd90697f3e8dcace3ad94'),
     ('https://dl.google.com/android/repository/android-ndk-r12b-linux-x86_64.zip',
@@ -339,8 +363,8 @@ cachefiles = [
      '0ecc2017802924cf81fffc0f51d342e3e69de6343da892ac9fa1cd79bc106024'),
     ('https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip',
      'f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c'),
-    ('https://download.qt.io/official_releases/qt/5.7/5.7.0/qt-opensource-linux-x64-android-5.7.0.run',
-     'f7e55b7970e59bdaabb88cb7afc12e9061e933992bda2f076f52600358644586'),
+    ('https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip',
+     'bcdea4f5353773b2ffa85b5a9a2ae35544ce88ec5b507301d8cf6a76b765d901'),
 ]
 
 
@@ -441,10 +465,6 @@ def main():
     else:
         update_cache(cachedir, cachefiles)
 
-    local_qt_filename = os.path.join(cachedir, 'qt-opensource-linux-x64-android-5.7.0.run')
-    logger.info("Setting executable bit for %s", local_qt_filename)
-    os.chmod(local_qt_filename, 0o755)
-
     # use VirtualBox software virtualization if hardware is not available,
     # like if this is being run in kvm or some other VM platform, like
     # http://jenkins.debian.net, the values are 'on' or 'off'
@@ -523,9 +543,9 @@ def main():
     debug_log_vagrant_vm(serverdir, config)
     try:
         v.up(provision=True)
-    except fdroidserver.vmtools.FDroidBuildVmException as e:
+    except subprocess.CalledProcessError:
         debug_log_vagrant_vm(serverdir, config)
-        logger.exception('could not bring buildserver vm up. %s', e)
+        logger.error("'vagrant up' failed, is the base box missing?")
         sys.exit(1)
 
     if config['copy_caches_from_host']:
@@ -538,10 +558,16 @@ def main():
         for d in ('.m2', '.gradle/caches', '.gradle/wrapper', '.pip_download_cache'):
             fullpath = os.path.join(os.getenv('HOME'), d)
             if os.path.isdir(fullpath):
-                # TODO newer versions of vagrant provide `vagrant rsync`
+                ssh_command = ' '.join(('ssh -i {0} -p {1}'.format(key, port),
+                                        '-o StrictHostKeyChecking=no',
+                                        '-o UserKnownHostsFile=/dev/null',
+                                        '-o LogLevel=FATAL',
+                                        '-o IdentitiesOnly=yes',
+                                        '-o PasswordAuthentication=no'))
+                # TODO vagrant 1.5+ provides `vagrant rsync`
                 run_via_vagrant_ssh(v, ['cd ~ && test -d', d, '|| mkdir -p', d])
-                subprocess.call(['rsync', '-axv', '--progress', '--delete', '-e',
-                                 'ssh -i {0} -p {1} -oIdentitiesOnly=yes'.format(key, port),
+                subprocess.call(['rsync', '-ax', '--delete', '-e',
+                                 ssh_command,
                                  fullpath + '/',
                                  user + '@' + hostname + ':~/' + d + '/'])