@@ -18,13 +18,13 @@ checkout step for each job: &addWorkspace
1818default config for js : &js_defaults
1919 << : *defaults
2020 docker :
21- - image : circleci/node:10
21+ - image : circleci/node:12
2222
2323default config for macOS : &macos_defaults
2424 << : *defaults
2525 resource_class : ' medium'
2626 macos :
27- xcode : ' 10.1 .0'
27+ xcode : ' 11.7 .0'
2828
2929default config for android apk builds : &android_defaults
3030 << : *defaults
@@ -41,31 +41,6 @@ default config for android apk builds: &android_defaults
4141# CACHE CONFIG
4242# ==============================
4343
44- # brew
45- save brew cache : &cache_save_brew
46- name : Saving Brew cache
47- paths :
48- - /usr/local/Homebrew
49- - ~/Library/Caches/Homebrew
50- key : legacy-brew-cache-{{ arch }}
51-
52- restore brew cache : &cache_restore_brew
53- name : Restoring Brew cache
54- keys :
55- - legacy-brew-cache-{{ arch }}
56-
57- save brew cache for android : &cache_save_brew_android
58- name : Saving Brew cache for android
59- paths :
60- - /usr/local/Homebrew
61- - ~/Library/Caches/Homebrew
62- key : legacy-brew-cache-{{ arch }}-android
63-
64- restore brew cache for android : &cache_restore_brew_android
65- name : Restoring Brew cache for android
66- keys :
67- - legacy-brew-cache-{{ arch }}-android
68-
6944# yarn
7045save yarn cache : &cache_save_yarn
7146 name : Saving Yarn cache
@@ -141,16 +116,12 @@ jobs:
141116 << : *macos_defaults
142117 steps :
143118 - *addWorkspace
144- - restore-cache : *cache_restore_brew
145119 - run :
146- name : Configure OSX Environment
120+ name : Configure macOS Environment
147121 command : |
148- HOMEBREW_NO_AUTO_UPDATE=1 brew install node@8 >/dev/null
149- HOMEBREW_NO_AUTO_UPDATE=1 brew tap wix/brew >/dev/null
150- HOMEBREW_NO_AUTO_UPDATE=1 brew install applesimutils >/dev/null
122+ brew bundle --file=.circleci/Brewfile.ios --no-lock
151123 touch .watchmanconfig
152124 node -v
153- - save-cache : *cache_save_brew
154125 - restore-cache : *cache_restore_yarn
155126 - run :
156127 name : Installing Yarn dependencies
@@ -223,25 +194,20 @@ jobs:
223194 source $BASH_ENV
224195
225196 # Android tools
226- - restore-cache : *cache_restore_brew_android
227197 - run :
228198 name : Install Android SDK tools
229199 command : |
230- HOMEBREW_NO_AUTO_UPDATE=1 brew tap homebrew/cask >/dev/null
231- HOMEBREW_NO_AUTO_UPDATE=1 brew cask install android-sdk >/dev/null
232- HOMEBREW_NO_AUTO_UPDATE=1 brew cask install intel-haxm >/dev/null
233- HOMEBREW_NO_AUTO_UPDATE=1 brew install node@8 >/dev/null >/dev/null
234- - save-cache : *cache_save_brew_android
200+ brew bundle --file=.circleci/Brewfile.android --no-lock
235201
236202 - run :
237203 name : Install Android emulator
238204 shell : /bin/bash -e
239205 command : |
240- yes | sdkmanager "platform-tools" "tools" > /dev/null
241- yes | sdkmanager "platforms;android-28" "system-images;android-21;google_apis;x86" > /dev/null
242- yes | sdkmanager "emulator" --channel=3 > /dev/null
243- yes | sdkmanager "build-tools;28.0.3" > /dev/null
244- yes | sdkmanager --licenses > /dev/null
206+ yes | sdkmanager "platform-tools" "tools" 1> /dev/null
207+ yes | sdkmanager "platforms;android-28" "system-images;android-21;google_apis;x86" 1> /dev/null
208+ yes | sdkmanager "emulator" --channel=3 1> /dev/null
209+ yes | sdkmanager "build-tools;28.0.3" 1> /dev/null
210+ yes | sdkmanager --licenses 1> /dev/null
245211 yes | sdkmanager --list
246212
247213 - run :
0 commit comments