From b40e23dee5a9a563ca46a0a90d42f998fb2c3f38 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Wed, 31 Oct 2018 21:40:35 -0700 Subject: [PATCH] bump buck to 2018.10.29.01. fixes Android CI (#22049) Summary: Bump buck to latest or 2018.10.29.01, which will fix Android CI. Pull Request resolved: https://github.com/facebook/react-native/pull/22049 Differential Revision: D12879205 Pulled By: TheSavior fbshipit-source-id: 5d196fba38cb27266cadbebae00367aa773751ca --- .circleci/config.yml | 8 ++++---- ContainerShip/Dockerfile.android-base | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 89fe32f77d405c..777f0221192f41 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -57,13 +57,13 @@ aliases: - &restore-cache-downloads-buck keys: - - v3-buck-v2018.07.23.01-{{ checksum "scripts/circleci/buck_fetch.sh" }}} - - v3-buck-v2018.07.23.01- + - v3-buck-v2018.10.29.01-{{ checksum "scripts/circleci/buck_fetch.sh" }}} + - v3-buck-v2018.10.29.01- - &save-cache-downloads-buck paths: - ~/buck - ~/okbuck - key: v3-buck-v2018.07.23.01-{{ checksum "scripts/circleci/buck_fetch.sh" }} + key: v3-buck-v2018.10.29.01-{{ checksum "scripts/circleci/buck_fetch.sh" }} - &restore-cache-watchman keys: @@ -132,7 +132,7 @@ aliases: name: Install BUCK command: | if [[ ! -e ~/buck ]]; then - git clone https://github.com/facebook/buck.git ~/buck --branch v2018.07.23.01 --depth=1 + git clone https://github.com/facebook/buck.git ~/buck --branch v2018.10.29.01 --depth=1 fi cd ~/buck && ant buck --version diff --git a/ContainerShip/Dockerfile.android-base b/ContainerShip/Dockerfile.android-base index 560a2c461283b0..9444f2b7136f27 100644 --- a/ContainerShip/Dockerfile.android-base +++ b/ContainerShip/Dockerfile.android-base @@ -25,7 +25,7 @@ LABEL maintainer="Héctor Ramos " ARG SDK_VERSION=sdk-tools-linux-3859397.zip ARG ANDROID_BUILD_VERSION=27 ARG ANDROID_TOOLS_VERSION=27.0.3 -ARG BUCK_VERSION=v2018.07.23.01 +ARG BUCK_VERSION=v2018.10.29.01 ARG NDK_VERSION=17c ARG NODE_VERSION=8.10.0 ARG WATCHMAN_VERSION=4.9.0