From bf21002f2a7f4541091e04758cd32c97da53c893 Mon Sep 17 00:00:00 2001
From: Konstantin Raev <bestander@fb.com>
Date: Wed, 10 Feb 2016 13:51:33 -0800
Subject: [PATCH] =?UTF-8?q?Circle=20CI=20stopped=20working=20with=20Gradle?=
 =?UTF-8?q?=20properly=20https://circleci.com/g=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
…h/facebook/react-native/2393, this is a fix
Closes https://github.com/facebook/react-native/pull/5857

Reviewed By: svcscm

Differential Revision: D2923274

Pulled By: androidtrunkagent

fb-gh-sync-id: 0f76958fde4639eca0b3f59b85a1443adf8c48d1
shipit-source-id: 0f76958fde4639eca0b3f59b85a1443adf8c48d1
---
 circle.yml | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/circle.yml b/circle.yml
index b0ea6e990..7ea22ee0e 100644
--- a/circle.yml
+++ b/circle.yml
@@ -13,23 +13,25 @@ machine:
 
 dependencies:
   pre:
-  # BUCK
-  - if [[ ! -e buck ]]; then git clone https://github.com/facebook/buck.git; fi
-  - cd buck && ant
-  - buck/bin/buck --version
-  - buck/bin/buck fetch ReactAndroid/src/test/java/com/facebook/react/modules
-  - buck/bin/buck fetch ReactAndroid/src/main/java/com/facebook/react		 
-  - buck/bin/buck fetch ReactAndroid/src/main/java/com/facebook/react/shell
-  - buck/bin/buck fetch ReactAndroid/src/test/...
-  - buck/bin/buck fetch ReactAndroid/src/androidTest/...
-  # using npm@3 because of problems with shrink-wrapped optional deps installs on linux
-  - npm install -g npm@3.2
-  - source scripts/circle-ci-android-setup.sh && getAndroidSDK
-  - ./gradlew :ReactAndroid:downloadBoost :ReactAndroid:downloadDoubleConversion :ReactAndroid:downloadFolly :ReactAndroid:downloadGlog
+    # BUCK
+    - if [[ ! -e buck ]]; then git clone https://github.com/facebook/buck.git; fi
+    - cd buck && ant
+    - buck/bin/buck --version
+    - buck/bin/buck fetch ReactAndroid/src/test/java/com/facebook/react/modules
+    - buck/bin/buck fetch ReactAndroid/src/main/java/com/facebook/react
+    - buck/bin/buck fetch ReactAndroid/src/main/java/com/facebook/react/shell
+    - buck/bin/buck fetch ReactAndroid/src/test/...
+    - buck/bin/buck fetch ReactAndroid/src/androidTest/...
+    # using npm@3 because of problems with shrink-wrapped optional deps installs on linux
+    - npm install -g npm@3.2
+    - source scripts/circle-ci-android-setup.sh && getAndroidSDK
+    - ./gradlew :ReactAndroid:downloadBoost :ReactAndroid:downloadDoubleConversion :ReactAndroid:downloadFolly :ReactAndroid:downloadGlog
   cache_directories:
-  - "ReactAndroid/build/downloads"
-  - "buck"
-  - "buck-out/bin"
+    - "ReactAndroid/build/downloads"
+    - "buck"
+    - "buck-out/bin"
+  override:
+    - npm install
 test:
   pre:
     # starting emulator in advance because it takes very long to boot