Merge pull request #2172 from StoDevX/build-and-deploy-on-circleci

Build and deploy on CircleCI

Author: hawkrives

.circleci/config.yml

@@ -2,7 +2,7 @@
 version: 2
 
 x-config:
-  x-caching: # caching instructions
+  x-caching:  # caching instructions
     - &save-cache-yarn
       key: 'v3-yarn-dependencies-{{ arch }}-{{ checksum "yarn.lock" }}'
       paths: [~/.cache/yarn, ~/Library/Caches/Yarn]
@@ -18,27 +18,63 @@ x-config:
       paths: [~/.gradle]
     - &restore-cache-gradle
       key: 'v1-gradle-dependencies-{{ arch }}-{{ checksum "android/build.gradle" }}-{{ checksum "android/app/build.gradle" }}-{{ checksum "node_modules/react-native/package.json" }}'
-  x-commands: # command shorthands
+  x-commands:  # command shorthands
     - &set-ruby-version
       name: Set Ruby Version
       command: echo "ruby-2.4.2" > ~/.ruby-version
     - &run-danger
       command: yarn run danger --id $task
       when: always
+    - &embed-env-vars
+      name: Embed environment variables into the app
+      command: |
+        touch .env.js
+        echo "export const GOOGLE_CALENDAR_API_KEY = '$GCAL_KEY'" >> .env.js
+        echo "export const GOOGLE_MAPS_API_KEY = '$GMAPS_KEY'" >> .env.js
 
 workflows:
   version: 2
-  analyze:
-    jobs:
-      - cache-yarn-linux
-      - danger: {requires: [cache-yarn-linux]}
-      - flow: {requires: [cache-yarn-linux]}
-      - jest: {requires: [cache-yarn-linux]}
-      - prettier: {requires: [cache-yarn-linux]}
-      - eslint: {requires: [cache-yarn-linux]}
-      - data: {requires: [cache-yarn-linux]}
-      - ios: {requires: [danger, flow, jest, prettier, eslint, data]}
-      - android: {requires: [danger, flow, jest, prettier, eslint, data]}
+  analyze-and-build:
+    # The way this works is, Circle runs analyze-and-build on every commit
+    # to every branch.
+    # Fastlane checks the environment to see if it should build or deploy,
+    # and if there's a tag then it deploys (otherwise it just builds.)
+    # These same jobs are run by the "nightly" workflow, which has a
+    # different CIRCLE_WORKFLOW_ID, which should allow us to only deploy
+    # nightlies from that branch.
+    jobs: &basic-jobs
+      - cache-yarn-linux: 
+          filters: &filters {tags: {only: /.*/}}
+      - danger: 
+          filters: *filters
+          requires: [cache-yarn-linux]
+      - flow: 
+          filters: *filters
+          requires: [cache-yarn-linux]
+      - jest: 
+          filters: *filters
+          requires: [cache-yarn-linux]
+      - prettier: 
+          filters: *filters
+          requires: [cache-yarn-linux]
+      - eslint: 
+          filters: *filters
+          requires: [cache-yarn-linux]
+      - data: 
+          filters: *filters
+          requires: [cache-yarn-linux]
+      - ios:
+          filters: *filters
+          requires: [danger, flow, jest, prettier, eslint, data]
+      - android:
+          filters: *filters
+          requires: [danger, flow, jest, prettier, eslint, data]
+  nightly:
+    triggers:
+      - schedule:
+          cron: 0 6 * * *
+          filters: {branches: {only: [master]}}
+    jobs: *basic-jobs
 
 jobs:
   cache-yarn-linux:
@@ -178,8 +214,12 @@ jobs:
           environment: {TERM: xterm-256color}
       - save_cache: *save-cache-gradle
       - run: mkdir -p logs/
-      - run: touch .env.js
-      - run: bundle exec fastlane android ci-run | tee ./logs/build
+      - run: *embed-env-vars
+      - run:
+          name: Run Fastlane
+          command: bundle exec fastlane android ci-run | tee ./logs/build
+          environment:
+            GIT_COMMIT_DESC: $(git log --format=oneline -n 1 $CIRCLE_SHA1)
       - run: *run-danger
 
   ios:
@@ -202,8 +242,12 @@ jobs:
       - run: bundle check || bundle install --frozen --path ./vendor/bundle
       - save_cache: *save-cache-bundler
       - run: mkdir -p logs/
-      - run: touch .env.js
-      - run: bundle exec fastlane ios ci-run | tee ./logs/build
+      - run: *embed-env-vars
+      - run:
+          name: Run Fastlane
+          command: bundle exec fastlane ios ci-run | tee ./logs/build
+          environment:
+            GIT_COMMIT_DESC: $(git log --format=oneline -n 1 $CIRCLE_SHA1)
       - run:
           name: Analyze Fastlane Logfile
           command: python2 ./scripts/analyze-gym.py -s 20 < ./logs/build | tee ./logs/analysis || true

.travis.yml

@@ -1,23 +1,20 @@
+---
 env:
   # To update the secure tokens, run `travis encrypt NAME='VALUE' --add` after
   # installing the travis gem with `gem install travis`.
   global:
     # variables from the web interface:
     # - BOT_ITC_PASSWORD_FOR_FASTLANE
     # - BUGSNAG_KEY: api key for Bugsnag connection
-    # - CI_USER_TOKEN: unknown
+    # - CI_USER_TOKEN: used to auth with the keys repo
     # - DANGER_GITHUB_API_TOKEN: api key to let Danger write comments to github
-    # - FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: app-specific password for the iTMS Transporter (obselete)
     # - FASTLANE_PASSWORD: password for apple id used by fastlane
-    # - FASTLANE_SESSION: if fastlane's apple ID has 2fa enabled, this is the 1-month 2fa session cookie
     # - GCAL_KEY: google calendar API key
     # - GH_TOKEN: unknown
     # - GITHUB_PAGES_TOKEN: token to push to gh-pages
     # - GMAPS_KEY: google maps API key
     # sets our node version in one nice place
     - TRAVIS_NODE_VERSION=8
-    # set the ruby version up top
-    - TRAVIS_RUBY_VERSION=ruby-2.4.2
     # configure fastlane a bit
     - FASTLANE_SKIP_UPDATE_CHECK=1
     - FASTLANE_DISABLE_ANIMATION=1
@@ -32,102 +29,36 @@ env:
 branches:
   only:
     - master
-    - /^travis/
     - /^greenkeeper\//
-    - /^v?(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-[\da-z\-]+(?:\.[\da-z\-]+)*)?(?:\+[\da-z\-]+(?:\.[\da-z\-]+)*)?$/
 
 
 stages:
   - name: Greenkeeper
     if: branch =~ ^greenkeeper\/
   - name: Deploy Data
     if: branch = master AND type != pull_request
-  - name: Build + Deploy
-    if: type = cron OR tag IS present
-
-
-#
-# Definitions of dictionaries that are used by the machines below
-#
-
-x-definitions:
-  - &base
-    before_install:
-      # dirty hack for https://github.com/travis-ci/travis-ci/issues/5092
-      - export PATH="${PATH/\.\/node_modules\/\.bin/}"
-
-      # finish bypassing 2fa auth for fastlane
-      - unset FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD
-      - unset FASTLANE_SESSION
-
-      # print some travis debugging info
-      - echo "Now testing on $TRAVIS_OS_NAME"
-      - echo "Travis branch is $TRAVIS_BRANCH"
-      - echo "Travis is in pull request $TRAVIS_PULL_REQUEST"
-      - echo "Build triggered by $TRAVIS_EVENT_TYPE"
-
-      # force the ruby we want
-      - echo "Using ruby $TRAVIS_RUBY_VERSION (ruby -v says $(ruby -v))"
-      - rvm use $TRAVIS_RUBY_VERSION --install --binary --create
-      - echo "ruby -v is now $(ruby -v)"
-      - gem install bundler
-
-      # force a consistent node version
-      - echo "Using node $TRAVIS_NODE_VERSION (node -v says $(node -v))"
-      - nvm install "$TRAVIS_NODE_VERSION"
-      - nvm use "$TRAVIS_NODE_VERSION"
-      - echo "node -v is now $(node -v)"
-
-      # travis doesn't install yarn automatically on osx
-      - if [[ $TRAVIS_OS_NAME == "osx" ]]; then brew install yarn --without-node; fi
-
-    install:
-      # install packages (if the first fails, try once more)
-      - yarn || yarn
-
-      # install fastlane (if at first you don't succeed, try once more)
-      - bundle install || bundle install
-
-    before_script:
-      # ensure the env file exists and fill it out
-      - touch .env.js
-      - echo "export const GOOGLE_CALENDAR_API_KEY = '$GCAL_KEY'" >> .env.js
-      - echo "export const GOOGLE_MAPS_API_KEY = '$GMAPS_KEY'" >> .env.js
-
-      # disable npm wrapper for npm scripts
-      - npm config set loglevel=silent
-      - mkdir -p logs/
-
-    after_script:
-      - npm config set loglevel=notice
-      - npm run danger -- --id $task
-
-    before_cache:
-      - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-      - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-
-  - &simplejs
-    os: linux
-    sudo: false
-    distro: trusty
-    language: node_js
-    node_js: $TRAVIS_NODE_VERSION
 
 
 jobs:
-  # We define default before_install, install, and before_script steps.
-  # To skip the default step, use `step_name: skip`.
   include:
     # Run greenkeeper stuff
-    - <<: *simplejs
+    - os: linux
+      sudo: false
+      distro: trusty
+      language: node_js
+      node_js: $TRAVIS_NODE_VERSION
       stage: Greenkeeper
       env: [task=GREENKEEPER]
       install: npm install -g greenkeeper-lockfile@1
       script: greenkeeper-lockfile-update
       after_script: greenkeeper-lockfile-upload
 
     # Deploy the gh-pages data
-    - <<: *simplejs
+    - os: linux
+      sudo: false
+      distro: trusty
+      language: node_js
+      node_js: $TRAVIS_NODE_VERSION
       stage: Deploy Data
       env: [task=GH_PAGES]
       install: yarn || yarn
@@ -141,48 +72,5 @@ jobs:
         github_token: $GITHUB_PAGES_TOKEN
         local_dir: docs/
 
-    # Build/deploy the Android binary
-    - <<: *base
-      stage: Build + Deploy
-      os: linux
-      sudo: required
-      distro: trusty
-      language: android
-      env: [task=ANDROID]
-      android:
-        components:
-          - tools
-          - platform-tools
-          - build-tools-23.0.1
-          - build-tools-23.0.2
-          - build-tools-25.0.0
-          - build-tools-25.0.1
-          - build-tools-25.0.2
-          - build-tools-25.0.3
-          - build-tools-26.0.1
-          - android-23
-          - android-25
-          - android-26
-          - extra-android-m2repository
-          - extra-google-m2repository
-      script:
-        - bundle exec fastlane android ci-run | tee ./logs/build
-
-    # Build/deploy the iOS binary
-    - <<: *base
-      stage: Build + Deploy
-      os: osx
-      language: objective-c
-      osx_image: xcode9.2
-      env: [task=IOS]
-      script:
-        - bundle exec fastlane ios ci-run | tee ./logs/build
-        - python2 ./scripts/analyze-gym.py -s 20 < ./logs/build | tee ./logs/analysis || true
-
 cache:
-  bundler: true
   yarn: true
-  directories:
-    - $HOME/.gradle
-    - $HOME/.gradle/wrapper/
-    - $HOME/.android/build-cache

fastlane/lib/commands.rb

@@ -1,32 +1,25 @@
 # coding: utf-8
 
-# It doesn't make sense to duplicate this in both platforms, and fastlane is
-# smart enough to call the appropriate platform's "beta" lane. So, let's make
-# a beta build if there have been new commits since the last beta.
+# Pick what to do - build + deploy, build + sign, or just plain build.
 def auto_beta
-  UI.message "TRAVIS_EVENT_TYPE: #{ENV['TRAVIS_EVENT_TYPE']}"
-  if should_deploy?
-    if cron?
-      UI.message 'building nightly'
-      nightly
-    else
-      UI.message 'building beta'
-      beta
-    end
+  if should_nightly?
+    UI.message 'building nightly'
+    nightly
+  elsif should_beta?
+    UI.message 'building beta'
+    beta
+  elsif has_api_keys?
+    UI.message 'signing and building, but not deploying'
+    build
   else
-    if pr?
-      UI.message 'just building (not signing)'
-      check_build
-    else
-      UI.message 'signing and building, but not deploying'
-      build
-    end
+    UI.message 'just building (not signing)'
+    check_build
   end
 end
 
 # Adds the github token for stodevx-bot to the CI machine
 def authorize_ci_for_keys
-  token = ENV['CI_USER_TOKEN']
+  token = ENV['GITHUB_KEYS_REPOSITORY_TOKEN']
 
   # see macoscope.com/blog/simplify-your-life-with-fastlane-match
   # we're allowing the CI access to the keys repo

fastlane/lib/git.rb

@@ -23,7 +23,7 @@ def git_changelog
 
 # Makes a changelog from the timespan passed
 def make_changelog
-  sh('git fetch --unshallow')
+  sh('git fetch --unshallow') if travis?
   log = git_changelog
 
   limit = 4_000