Merge pull request #1001 from CruGlobal/travis-fixes

install yarn for Android
CruGlobal · Jun 12, 2019 · 51bc5b6 · 51bc5b6
2 parents 8e79a0e + 1daa56c
commit 51bc5b6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -96,7 +96,8 @@ matrix:
         - echo yes | sdkmanager "build-tools;23.0.1" # Android platform required by some dependency
 
       install:
-        - yarn install
+        - brew install yarn
+        - yarn install --network-concurrency 1
         - (cd android && bundler install)
       before_script:
         - echo "TRAVIS_COMMIT=$TRAVIS_COMMIT" >> ./.env.production

diff --git a/ios/Podfile b/ios/Podfile
@@ -37,7 +37,9 @@ target 'MissionHub' do
 
   post_install do |installer|
       installer.pods_project.targets.each do |target|
-        if target.name == "React"
+        targets_to_ignore = %w(React yoga)
+
+        if targets_to_ignore.include? target.name
           target.remove_from_project
         end
       end

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -170,6 +170,6 @@ SPEC CHECKSUMS:
   RSKImageCropper: 98296ad26b41753f796b6898d015509598f13d97
   yoga: 92b2102c3d373d1a790db4ab761d2b0ffc634f64
 
-PODFILE CHECKSUM: dab9a512e8bc3b3a4f9291d65ceb5c1708487580
+PODFILE CHECKSUM: 642458d8a4d1297cf7f682cb37d3938ceb88f73f
 
 COCOAPODS: 1.7.1