From dcb7e5c2a12b81b50e58f18f07026fe1bcaed63d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= Date: Thu, 14 Feb 2019 10:15:06 -0800 Subject: [PATCH 1/6] Auto-accept licenses and unblock CI --- scripts/android-setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/android-setup.sh b/scripts/android-setup.sh index c76f520b931..7fa6193850a 100644 --- a/scripts/android-setup.sh +++ b/scripts/android-setup.sh @@ -16,6 +16,7 @@ function getAndroidPackages { # Package names can be obtained using `sdkmanager --list` if [ ! -e "$DEPS" ] || [ ! "$CI" ]; then + yes | sdkmanager --licenses echo "Installing Android API level $ANDROID_SDK_TARGET_API_LEVEL, Google APIs, $AVD_ABI system image..." sdkmanager "system-images;android-$ANDROID_SDK_TARGET_API_LEVEL;google_apis;$AVD_ABI" echo "Installing build SDK for Android API level $ANDROID_SDK_BUILD_API_LEVEL..." From ce046f0b102d20d86186ea087a64e99c229a0340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= Date: Thu, 14 Feb 2019 12:52:23 -0800 Subject: [PATCH 2/6] Individually accept licenses --- scripts/android-setup.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/scripts/android-setup.sh b/scripts/android-setup.sh index 7fa6193850a..f4adf6047d4 100644 --- a/scripts/android-setup.sh +++ b/scripts/android-setup.sh @@ -16,20 +16,19 @@ function getAndroidPackages { # Package names can be obtained using `sdkmanager --list` if [ ! -e "$DEPS" ] || [ ! "$CI" ]; then - yes | sdkmanager --licenses echo "Installing Android API level $ANDROID_SDK_TARGET_API_LEVEL, Google APIs, $AVD_ABI system image..." - sdkmanager "system-images;android-$ANDROID_SDK_TARGET_API_LEVEL;google_apis;$AVD_ABI" + echo y | sdkmanager "system-images;android-$ANDROID_SDK_TARGET_API_LEVEL;google_apis;$AVD_ABI" echo "Installing build SDK for Android API level $ANDROID_SDK_BUILD_API_LEVEL..." - sdkmanager "platforms;android-$ANDROID_SDK_BUILD_API_LEVEL" + echo y | sdkmanager "platforms;android-$ANDROID_SDK_BUILD_API_LEVEL" echo "Installing target SDK for Android API level $ANDROID_SDK_TARGET_API_LEVEL..." - sdkmanager "platforms;android-$ANDROID_SDK_TARGET_API_LEVEL" + echo y | sdkmanager "platforms;android-$ANDROID_SDK_TARGET_API_LEVEL" echo "Installing SDK build tools, revision $ANDROID_SDK_BUILD_TOOLS_REVISION..." - sdkmanager "build-tools;$ANDROID_SDK_BUILD_TOOLS_REVISION" + echo y | sdkmanager "build-tools;$ANDROID_SDK_BUILD_TOOLS_REVISION" # These moved to "system-images;android-$ANDROID_SDK_BUILD_API_LEVEL;google_apis;x86" starting with API level 25, but there is no ARM version. echo "Installing Google APIs $ANDROID_GOOGLE_API_LEVEL..." - sdkmanager "add-ons;addon-google_apis-google-$ANDROID_GOOGLE_API_LEVEL" + echo y | sdkmanager "add-ons;addon-google_apis-google-$ANDROID_GOOGLE_API_LEVEL" echo "Installing Android Support Repository" - sdkmanager "extras;android;m2repository" + echo y | sdkmanager "extras;android;m2repository" $CI && touch "$DEPS" fi } From c532dfd237ffa1ef1bcb0ea646c181ecb2a3c56c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= Date: Thu, 14 Feb 2019 13:15:18 -0800 Subject: [PATCH 3/6] Use current user in cache key --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b5fda92a7d6..dce88a074b7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -57,13 +57,13 @@ aliases: - &restore-cache-downloads-buck keys: - - v3-buck-v2019.01.10.01-{{ checksum "scripts/circleci/buck_fetch.sh" }}} - - v3-buck-v2019.01.10.01- + - v3-buck-v2019.01.10.01-{{ /usr/bin/id -run }}-{{ checksum "scripts/circleci/buck_fetch.sh" }}} + - v3-buck-v2019.01.10.01-{{ /usr/bin/id -run }}- - &save-cache-downloads-buck paths: - ~/buck - ~/okbuck - key: v3-buck-v2019.01.10.01-{{ checksum "scripts/circleci/buck_fetch.sh" }} + key: v3-buck-v2019.01.10.01-{{ /usr/bin/id -run }}-{{ checksum "scripts/circleci/buck_fetch.sh" }} - &restore-cache-watchman keys: From ad279eef3d79b9a9e6ad5b77efe97e353ff1f032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= Date: Thu, 14 Feb 2019 13:23:02 -0800 Subject: [PATCH 4/6] Fix id command --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dce88a074b7..9944b64d37c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -57,13 +57,13 @@ aliases: - &restore-cache-downloads-buck keys: - - v3-buck-v2019.01.10.01-{{ /usr/bin/id -run }}-{{ checksum "scripts/circleci/buck_fetch.sh" }}} - - v3-buck-v2019.01.10.01-{{ /usr/bin/id -run }}- + - v3-buck-v2019.01.10.01-{{ id -run }}-{{ checksum "scripts/circleci/buck_fetch.sh" }}} + - v3-buck-v2019.01.10.01-{{ id -run }}- - &save-cache-downloads-buck paths: - ~/buck - ~/okbuck - key: v3-buck-v2019.01.10.01-{{ /usr/bin/id -run }}-{{ checksum "scripts/circleci/buck_fetch.sh" }} + key: v3-buck-v2019.01.10.01-{{ id -run }}-{{ checksum "scripts/circleci/buck_fetch.sh" }} - &restore-cache-watchman keys: From 85a2e7146e7c31eb45039527422b0978462bd550 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= Date: Thu, 14 Feb 2019 13:26:48 -0800 Subject: [PATCH 5/6] Revert "Fix id command" This reverts commit ad279eef3d79b9a9e6ad5b77efe97e353ff1f032. --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9944b64d37c..dce88a074b7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -57,13 +57,13 @@ aliases: - &restore-cache-downloads-buck keys: - - v3-buck-v2019.01.10.01-{{ id -run }}-{{ checksum "scripts/circleci/buck_fetch.sh" }}} - - v3-buck-v2019.01.10.01-{{ id -run }}- + - v3-buck-v2019.01.10.01-{{ /usr/bin/id -run }}-{{ checksum "scripts/circleci/buck_fetch.sh" }}} + - v3-buck-v2019.01.10.01-{{ /usr/bin/id -run }}- - &save-cache-downloads-buck paths: - ~/buck - ~/okbuck - key: v3-buck-v2019.01.10.01-{{ id -run }}-{{ checksum "scripts/circleci/buck_fetch.sh" }} + key: v3-buck-v2019.01.10.01-{{ /usr/bin/id -run }}-{{ checksum "scripts/circleci/buck_fetch.sh" }} - &restore-cache-watchman keys: From 99ebebdee6ea43a87be46213f99fb8564c0e0945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= Date: Thu, 14 Feb 2019 13:26:56 -0800 Subject: [PATCH 6/6] Revert "Use current user in cache key" This reverts commit c532dfd237ffa1ef1bcb0ea646c181ecb2a3c56c. --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dce88a074b7..b5fda92a7d6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -57,13 +57,13 @@ aliases: - &restore-cache-downloads-buck keys: - - v3-buck-v2019.01.10.01-{{ /usr/bin/id -run }}-{{ checksum "scripts/circleci/buck_fetch.sh" }}} - - v3-buck-v2019.01.10.01-{{ /usr/bin/id -run }}- + - v3-buck-v2019.01.10.01-{{ checksum "scripts/circleci/buck_fetch.sh" }}} + - v3-buck-v2019.01.10.01- - &save-cache-downloads-buck paths: - ~/buck - ~/okbuck - key: v3-buck-v2019.01.10.01-{{ /usr/bin/id -run }}-{{ checksum "scripts/circleci/buck_fetch.sh" }} + key: v3-buck-v2019.01.10.01-{{ checksum "scripts/circleci/buck_fetch.sh" }} - &restore-cache-watchman keys: