Add caching to CI's and fix docs (#1525)

* seperate docs from other deployment

* combine docs with pods for deployment. Build takes forever

* use travis image versions insteated of reinstalling gems

* update lockfile

* only one real gem neede, jazzy install it directly when needed

* remove bundle exec

* attempt to fix circle

* add back rake to Gemfile because circle needs it along with jazzy, travis use jazzy from bundler also

* fix circle

* add back lockfile and use bundler cache

* remove rake from gemfile

* add back gem installs to see if it fixes rake on circle

* remove travis, circle: pull from cache each build, save cache during jazzy since it's fast and runs first

* fix

* fix

* fix

* fix

* add cache-key alias to circle

* save cache after all

* remove extra file that was added on accident

* add back travis to push pods

* add back travis to push docks and pod

* add back bundle install

* use travis for all releases

* seperate builds in travis

* add bundle install

* update:

* add back path to circle

* get rid of bundle warning in circle

* get rid of warning in travis about bundle

* set config path for bundle in docs

* add updated token for docs

* remove travis builds from circle for faster tests

* fix nightly

* save cache after ios

* bump xcode to 11.6

* clean up circle

* change environment var

Co-authored-by: Tom Fox <[email protected]>

Author: cbaker6

.circleci/config.yml

@@ -1,12 +1,22 @@
 defaults: &defaults
     macos:
-      xcode: "11.4.1"
+      xcode: "11.6.0"
     shell: /bin/bash --login -eo pipefail
 aliases:
+  - &cache-pull
+    keys:
+      - gem-cache-v1-{{ arch }}-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
+      - gem-cache-v1-{{ arch }}-{{ .Branch }}
+      - gem-cache-v1
+  - &cache-push
+    key: gem-cache-v1-{{ arch }}-{{ .Branch }}-{{ checksum "Gemfile.lock" }}
+    paths:
+      - vendor/bundle
   - &prepare
     |
       git submodule update --init --recursive
       sudo gem install bundler
+      bundle config set path 'vendor/bundle'
       bundle install
   - &filter-only-master
     branches:
@@ -19,7 +29,9 @@ jobs:
     <<: *defaults
     steps:
       - checkout
+      - restore_cache: *cache-pull
       - run: *prepare
+      - save_cache: *cache-push
       - run: bundle exec rake test:ios
       - run: bash <(curl -s https://codecov.io/bash)
       - store_test_results:
@@ -28,7 +40,9 @@ jobs:
     <<: *defaults
     steps:
       - checkout
+      - restore_cache: *cache-pull
       - run: *prepare
+      - save_cache: *cache-push
       - run:
           name: "Create and set the default keychain"
           command: |
@@ -47,7 +61,9 @@ jobs:
     <<: *defaults
     steps:
       - checkout
+      - restore_cache: *cache-pull
       - run: *prepare
+      - save_cache: *cache-push
       - run: bundle exec rake test:facebook_utils:ios
       - run: bash <(curl -s https://codecov.io/bash)
       - store_test_results:
@@ -56,7 +72,9 @@ jobs:
     <<: *defaults
     steps:
       - checkout
+      - restore_cache: *cache-pull
       - run: *prepare
+      - save_cache: *cache-push
       - run: bundle exec rake test:twitter_utils:ios
       - run: bash <(curl -s https://codecov.io/bash)
       - store_test_results:
@@ -65,35 +83,21 @@ jobs:
     <<: *defaults
     steps:
       - checkout
+      - restore_cache: *cache-pull
       - run: *prepare
+      - save_cache: *cache-push
       - run: bundle exec rake test:parseui:all
       - run: bash <(curl -s https://codecov.io/bash)
       - store_test_results:
           path: build/reports
-  deployment:
-    <<: *defaults
-    steps:
-      - checkout
-      - run: *prepare
-      - run: bundle exec rake package:release
-  jazzy:
-    <<: *defaults
-    steps:
-      - checkout
-      - run: *prepare
-      - run: ./Scripts/jazzy.sh
   carthage:
     <<: *defaults
     steps:
       - checkout
+      - restore_cache: *cache-pull
       - run: *prepare
+      - save_cache: *cache-push
       - run: bundle exec rake test:carthage
-  cocoapods:
-    <<: *defaults
-    steps:
-      - checkout
-      - run: *prepare
-      - run: bundle exec rake test:cocoapods
 
 workflows:
   version: 2
@@ -104,23 +108,12 @@ workflows:
       - facebook_utils
       - twitter_utils
       - parseui
-      - jazzy
-      - deployment
-      - cocoapods:
-          requires:
-            - deployment
       - carthage:
           requires:
-            - deployment
+            - ios
   nightly:
     jobs:
-      - deployment
-      - cocoapods:
-          requires:
-            - deployment
-      - carthage:
-          requires:
-            - deployment
+      - carthage
     triggers:
       - schedule:
           cron: "0 1 * * *"

.travis.yml

@@ -1,54 +1,59 @@
 language: objective-c
 os: osx
-osx_image: xcode11.4.1
+osx_image: xcode11.6
 branches:
   only:
     - master
     - /^v?[0-9]+\.[0-9]+\.[0-9]+(-.*)?$/
 cache:
-  - cocoapods
-git:
-  submodules: false
-
-before_install:
-  - git submodule update --init --recursive
+  - bundle
 
 jobs:
   include:
     - stage: release
       env: Deployment
-      install: bundle install
+      install:
+        - bundle config set path 'vendor/bundle'
+        - bundle install
       script:
-      - ./Scripts/jazzy.sh
-      - bundle exec rake package:release
+        - bundle exec rake package:release
       deploy:
         - provider: releases
           token:
             secure: m7YayvmctH5lyHj13EV2j898P5xfEfN/ZvFm2gL/xveTNOGaET1O4ZmGmHApxC2QwIZvtwmO3U9pmB4XVVQ7kIlTsl01h84y8gx1XQqEKoQINcaVaNCsh9EdxAqj08aiwe/1dp8W8rI/ptOrxzWJDWcxKx5tMIbBzctGeL3GDKphVvD44s43oosqQCKzP+qHiI6rRRxu+0QccdbTagwd0X/yaLZ0IbTo35hWFEyJ6NfJnmCW/lNwWj86YksLCZx0eKdxUSQlIhnm0upTyowudt9bv8vSdEYi2AtRKoana/X53593O8RAVEc+S6NgMmeQ1/ZD1eDeyYLzN/z21EHb4yiwTnMUUhDBMTn8KKTiiSVDQOfAyRwtKF+1qN2iDr9Dh3A8+dCxOxJJpIPImZimt8KMCKB9WTtnJhvIoMCDpc8l29XM/oBxjCiBFxPClb9CZ74T5b+xl+yIqy2u8RiaZ1Va5vmWjMSXDsGHoZ0rJTOBkBBhyr+47yIw2VeY2z2q5hiALV3DnE5Esxyddhw7OXNZcvKriujnxcTOJwphm4XBMI/3rSH27uz7AaNdUHfTwaKqimPR06Kdv65hKmFuA5p/GuRdSYfYASvXYYrPjqKkst1FP6sWjJtpXvZIT/06RXDbGXZ6LB3TFHpOahPy8ID746OyBKgWzOB3ZCNmFCk=
           file_glob: true
           file: build/release/*
-          cleanup: false
+          skip_cleanup: true
           on:
             tags: true
             all_branches: true
+    - stage: release
+      env: Docs
+      install:
+        - bundle config set path 'vendor/bundle'
+        - bundle install
+      script:
+        - ./Scripts/jazzy.sh
+      deploy:
         - provider: pages
-          cleanup: false
-          token:
-            secure: m7YayvmctH5lyHj13EV2j898P5xfEfN/ZvFm2gL/xveTNOGaET1O4ZmGmHApxC2QwIZvtwmO3U9pmB4XVVQ7kIlTsl01h84y8gx1XQqEKoQINcaVaNCsh9EdxAqj08aiwe/1dp8W8rI/ptOrxzWJDWcxKx5tMIbBzctGeL3GDKphVvD44s43oosqQCKzP+qHiI6rRRxu+0QccdbTagwd0X/yaLZ0IbTo35hWFEyJ6NfJnmCW/lNwWj86YksLCZx0eKdxUSQlIhnm0upTyowudt9bv8vSdEYi2AtRKoana/X53593O8RAVEc+S6NgMmeQ1/ZD1eDeyYLzN/z21EHb4yiwTnMUUhDBMTn8KKTiiSVDQOfAyRwtKF+1qN2iDr9Dh3A8+dCxOxJJpIPImZimt8KMCKB9WTtnJhvIoMCDpc8l29XM/oBxjCiBFxPClb9CZ74T5b+xl+yIqy2u8RiaZ1Va5vmWjMSXDsGHoZ0rJTOBkBBhyr+47yIw2VeY2z2q5hiALV3DnE5Esxyddhw7OXNZcvKriujnxcTOJwphm4XBMI/3rSH27uz7AaNdUHfTwaKqimPR06Kdv65hKmFuA5p/GuRdSYfYASvXYYrPjqKkst1FP6sWjJtpXvZIT/06RXDbGXZ6LB3TFHpOahPy8ID746OyBKgWzOB3ZCNmFCk=
-          local_dir: docs/
+          skip_cleanup: true
+          github_token: $GITHUB_TOKEN
+          local_dir: ./docs/
           on:
             all_branches: true
             tags: true
     - stage: release
       env: Cocoapods
       install:
+        - bundle config set path 'vendor/bundle'
         - bundle install
         - bundle exec pod setup
-      script: travis_wait bundle exec pod lib lint --allow-warnings
+      script:
+        - travis_wait bundle exec pod lib lint --allow-warnings
       deploy:
-        provider: script
-        cleanup: false
-        script: travis_wait bundle exec pod trunk push Parse.podspec --allow-warnings
-        on:
-          tags: true
-          all_branches: true
+        - provider: script
+          skip_cleanup: true
+          script: travis_wait bundle exec pod trunk push Parse.podspec --allow-warnings
+          on:
+            tags: true
+            all_branches: true

Gemfile

@@ -2,7 +2,6 @@ source 'https://rubygems.org'
 
 gem 'plist'
 gem 'naturally', '~> 1.3.2'
-gem 'jazzy', '~> 0.13.3'
-gem 'cocoapods', '~> 1.8.4'
+gem 'jazzy', '~> 0.13.5'
 gem 'xcpretty'
 gem 'rake'

Gemfile.lock

@@ -2,20 +2,20 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (3.0.2)
-    activesupport (4.2.11.1)
+    activesupport (4.2.11.3)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    algoliasearch (1.27.2)
+    algoliasearch (1.27.3)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
     claide (1.0.3)
-    cocoapods (1.8.4)
+    cocoapods (1.9.3)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.8.4)
+      cocoapods-core (= 1.9.3)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -30,15 +30,17 @@ GEM
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.11.1, < 2.0)
-    cocoapods-core (1.8.4)
+      xcodeproj (>= 1.14.0, < 2.0)
+    cocoapods-core (1.9.3)
       activesupport (>= 4.0.2, < 6)
       algoliasearch (~> 1.0)
       concurrent-ruby (~> 1.1)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
+      netrc (~> 0.11)
+      typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.4)
-    cocoapods-downloader (1.3.0)
+    cocoapods-downloader (1.4.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
@@ -50,14 +52,16 @@ GEM
     colored2 (3.1.2)
     concurrent-ruby (1.1.6)
     escape (0.0.4)
-    ffi (1.12.2)
+    ethon (0.12.0)
+      ffi (>= 1.3.0)
+    ffi (1.13.1)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jazzy (0.13.3)
+    jazzy (0.13.5)
       cocoapods (~> 1.5)
       mustache (~> 1.1)
       open4
@@ -66,12 +70,12 @@ GEM
       sassc (~> 2.1)
       sqlite3 (~> 1.3)
       xcinvoke (~> 0.3.0)
-    json (2.3.0)
+    json (2.3.1)
     liferaft (0.0.6)
-    minitest (5.14.0)
+    minitest (5.14.1)
     molinillo (0.6.6)
     mustache (1.1.1)
-    nanaimo (0.2.6)
+    nanaimo (0.3.0)
     nap (1.1.0)
     naturally (1.3.2)
     netrc (0.11.0)
@@ -81,29 +85,30 @@ GEM
     redcarpet (3.5.0)
     rouge (2.0.7)
     ruby-macho (1.4.0)
-    sassc (2.3.0)
+    sassc (2.4.0)
       ffi (~> 1.9)
     sqlite3 (1.4.2)
     thread_safe (0.3.6)
+    typhoeus (1.4.0)
+      ethon (>= 0.9.0)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
-    xcodeproj (1.16.0)
+    xcodeproj (1.17.1)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.6)
+      nanaimo (~> 0.3.0)
     xcpretty (0.3.0)
       rouge (~> 2.0.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (~> 1.8.4)
-  jazzy (~> 0.13.3)
+  jazzy (~> 0.13.5)
   naturally (~> 1.3.2)
   plist
   rake

Scripts/jazzy.sh

@@ -2,7 +2,7 @@ mkdir -p ./Parse/Bolts # Create a temporary bolts folder
 cp -R Carthage/Checkouts/Bolts-ObjC/Bolts/**/*.h ./Parse/Bolts # Copy bolts
 
 ver=`/usr/libexec/PlistBuddy -c "Print CFBundleShortVersionString" Parse/Parse/Resources/Parse-iOS.Info.plist`
-jazzy \
+bundle exec jazzy \
   --objc \
   --clean \
   --author "Parse Community" \