Fix Android apt-get step failure
Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/20373 Differential Revision: D8976675 Pulled By: hramos fbshipit-source-id: 5b46e5325fe546f091173153de0428bbef9f53da
This commit is contained in:
parent
1a6666a116
commit
8116c3f91a
|
@ -47,16 +47,6 @@ aliases:
|
||||||
- ~/.gradle
|
- ~/.gradle
|
||||||
key: v1-gradle-{{ .Branch }}-{{ checksum "build.gradle" }}-{{ checksum "ReactAndroid/build.gradle" }}
|
key: v1-gradle-{{ .Branch }}-{{ checksum "build.gradle" }}-{{ checksum "ReactAndroid/build.gradle" }}
|
||||||
|
|
||||||
- &restore-cache-apt
|
|
||||||
keys:
|
|
||||||
- v1-apt-{{ .Branch }}-{{ checksum "scripts/circleci/apt-get-android-deps.sh" }}
|
|
||||||
# Fallback in case this is a first-time run on a fork
|
|
||||||
- v1-apt-master-{{ checksum "scripts/circleci/apt-get-android-deps.sh" }}
|
|
||||||
- &save-cache-apt
|
|
||||||
paths:
|
|
||||||
- ~/vendor/apt
|
|
||||||
key: v1-apt-{{ .Branch }}-{{ checksum "scripts/circleci/apt-get-android-deps.sh" }}
|
|
||||||
|
|
||||||
- &restore-cache-ndk
|
- &restore-cache-ndk
|
||||||
keys:
|
keys:
|
||||||
- v3-android-ndk-r10e-{{ checksum "scripts/android-setup.sh" }}
|
- v3-android-ndk-r10e-{{ checksum "scripts/android-setup.sh" }}
|
||||||
|
@ -68,7 +58,7 @@ aliases:
|
||||||
- &restore-cache-downloads-buck
|
- &restore-cache-downloads-buck
|
||||||
keys:
|
keys:
|
||||||
- v3-buck-v2018.06.25.01-{{ checksum "scripts/circleci/buck_fetch.sh" }}}
|
- v3-buck-v2018.06.25.01-{{ checksum "scripts/circleci/buck_fetch.sh" }}}
|
||||||
- v3-buck-v2018.06.25.01-
|
- v3-buck-v2018.06.25.01-
|
||||||
- &save-cache-downloads-buck
|
- &save-cache-downloads-buck
|
||||||
paths:
|
paths:
|
||||||
- ~/buck
|
- ~/buck
|
||||||
|
@ -490,9 +480,8 @@ jobs:
|
||||||
|
|
||||||
# Configure Android SDK and related dependencies
|
# Configure Android SDK and related dependencies
|
||||||
- run: *configure-android-path
|
- run: *configure-android-path
|
||||||
- restore-cache: *restore-cache-apt
|
# Android build deps install from the network faster than cache
|
||||||
- run: *install-android-build-dependencies
|
- run: *install-android-build-dependencies
|
||||||
- save-cache: *save-cache-apt
|
|
||||||
|
|
||||||
- restore-cache: *restore-cache-android-packages
|
- restore-cache: *restore-cache-android-packages
|
||||||
- run: *install-android-packages
|
- run: *install-android-packages
|
||||||
|
|
Loading…
Reference in New Issue