makebuildserver: re-add platform 27

[fdroidserver.git] / makebuildserver

diff --git a/makebuildserver b/makebuildserver
index 744fef52a9acb18aab3775d279ef09a1d4830b7d..de4289caf9fb3b49a3332fae67d1f14adcc34035 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -178,7 +178,10 @@ cachefiles = [
      '9b742d34590fe73fb7229e34835ecffb1846ca389d9f924f0b2a37de525dc6b8'),
     ('https://dl.google.com/android/repository/platform-26_r02.zip',
      '2aafa7d19c5e9c4b643ee6ade3d85ef89dc2f79e8383efdb9baf7fddad74b52a'),
-    ('https://dl.google.com/android/repository/platform-27_r01.zip',
+    # 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'),
@@ -252,6 +255,10 @@ cachefiles = [
      '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',
@@ -336,6 +343,10 @@ cachefiles = [
      '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://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',
@@ -354,8 +365,6 @@ cachefiles = [
      'f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c'),
     ('https://dl.google.com/android/repository/android-ndk-r16-linux-x86_64.zip',
      'a8550b81771c67cc6ab7b479a6918d29aa78de3482901762b4f9e0132cd9672e'),
-    ('https://download.qt.io/official_releases/qt/5.7/5.7.0/qt-opensource-linux-x64-android-5.7.0.run',
-     'f7e55b7970e59bdaabb88cb7afc12e9061e933992bda2f076f52600358644586'),
 ]
 
 
@@ -456,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'
@@ -553,15 +558,15 @@ 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):
-                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')
+                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',
+                subprocess.call(['rsync', '-ax', '--delete', '-e',
                                  ssh_command,
                                  fullpath + '/',
                                  user + '@' + hostname + ':~/' + d + '/'])