From 2c0e430a2d8c913e7090a5395b4aece3239f429c Mon Sep 17 00:00:00 2001 From: relan Date: Wed, 14 Feb 2018 09:01:37 +0300 Subject: [PATCH] makebuildserver: do not provision excessive NDKs When a new minor version of an NDK is released, it replaces an older one, e.g. r16 with r16b (see commit 6f295cb). But old NDK package remains in the cache and provisioning script unpacks it too as it matches the mask. Fix NDK provisioning to unzip only while-listed versions. --- buildserver/provision-android-ndk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/buildserver/provision-android-ndk b/buildserver/provision-android-ndk index e2a9a651..8e9724bc 100644 --- a/buildserver/provision-android-ndk +++ b/buildserver/provision-android-ndk @@ -14,8 +14,7 @@ if [ ! -e $NDK_BASE/r10e ]; then mv android-ndk-r10e r10e fi -for f in /vagrant/cache/android-ndk-r[1-9][0-9]*-linux-x86_64.zip; do - version=`echo $f |sed 's,.*\(r[1-9][0-9][a-z]\?\).*,\1,'` +for version in r11c r12b r13b r14b r15c r16b; do if [ ! -e ${NDK_BASE}/${version} ]; then unzip /vagrant/cache/android-ndk-${version}-linux-x86_64.zip > /dev/null mv android-ndk-${version} ${version} -- 2.30.2