cherry-pick master's release infrastructure

Author: hawkrives

.travis.yml

@@ -8,20 +8,8 @@ env:
     - MATCH_KEYCHAIN_PASSWORD=alpine
     # dirty hack for https://github.com/travis-ci/travis-ci/issues/5092
     - PATH=${PATH/\.\/node_modules\/\.bin/}
-    # centralize some variables for pushing/committing
-    - BRANCH=${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}
-    - REPO=$(git config remote.origin.url)
-    - SSH_REPO=${REPO/https:\/\/github.com\//[email protected]:}
-    # this just gives us a nice label to use
-    - ENCRYPTION_LABEL=199c454344e1
-    # set some other variables for the pushing process
-    - ENCRYPTED_KEY_VAR="encrypted_${ENCRYPTION_LABEL}_key"
-    - ENCRYPTED_IV_VAR="encrypted_${ENCRYPTION_LABEL}_iv"
-    - ENCRYPTED_KEY=${!ENCRYPTED_KEY_VAR}
-    - ENCRYPTED_IV=${!ENCRYPTED_IV_VAR}
-    - DEPLOY_KEY=scripts/travisci_deploy_key
     # variables that are used later on
-    - TRAVIS_NODE_VERSION=7
+    - TRAVIS_NODE_VERSION=8
     - PUSH_BRANCH=0
     - CAN_DEPLOY=0
     - USE_EMULATOR=no
@@ -34,7 +22,7 @@ matrix:
       dist: trusty
       sudo: false
       language: node_js
-      node_js: '7'
+      node_js: '8'
       env: [JS=yes, CAN_DEPLOY=yes]
 
     - &android-base
@@ -49,11 +37,15 @@ matrix:
           - tools
           - platform-tools
           - build-tools-23.0.1
+          - build-tools-23.0.2
+          - build-tools-25.0.1
           - build-tools-23.0.3
           - 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
 
@@ -72,7 +64,7 @@ matrix:
     - os: osx
       language: objective-c
       osx_image: xcode8.3
-      node_js: '7'
+      node_js: '8'
       env: [IOS=yes, CAN_DEPLOY=yes]
 
 
@@ -96,8 +88,15 @@ before_install:
   - rvm use ruby-2.3.1 --install --binary --create
   - gem install bundler
 
-  # only deploy from the once-daily cron-triggered jobs or from tagged commits
-  - if [[ $CAN_DEPLOY = yes && ( $TRAVIS_EVENT_TYPE = cron || $TRAVIS_TAG != "" ) ]]; then run_deploy=1; fi
+  # only deploy from:
+  # - cron-triggered jobs
+  # - tagged commits
+  # - commits whose messages contain the string [ci run beta]
+  - if [[ $CAN_DEPLOY = yes && (
+      $TRAVIS_EVENT_TYPE == "cron" ||
+      $TRAVIS_TAG != "" ||
+      $TRAVIS_COMMIT_MESSAGE == *"[ci run beta]"*
+    ) ]]; then run_deploy=1; fi
 
   # run our before_install sequence
   - bash scripts/travis/before_install.sh
@@ -106,7 +105,10 @@ install:
   - bash scripts/travis/install.sh
 
 before_script:
-  - bash scripts/travis/before_script.sh
+  # Fire up the Android emulator
+  - if [[ $ANDROID && $USE_EMULATOR = yes ]]; then
+      bundle exec fastlane android ci-emulator;
+    fi
 
 script:
   - bash scripts/travis/script.sh
@@ -124,6 +126,7 @@ deploy:
     local_dir: docs/
     on:
       branch: master
+      condition: $JS
 
 before_cache:
   - rm -f "$HOME/.gradle/caches/modules-2/modules-2.lock"

fastlane/Appfile

@@ -4,5 +4,7 @@ app_identifier 'NFMTHAZVS9.com.drewvolz.stolaf'
 # Your Apple email address
 apple_id '[email protected]'
 
-# you can even provide different app identifiers, Apple IDs and team names per lane:
-# More information: https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Appfile.md
+# This is a private key. It is not included in the repository.
+# Contact [email protected] or another admin if you need access.
+json_key_file 'fastlane/play-private-key.json'
+package_name 'com.allaboutolaf'

fastlane/Deliverfile

@@ -0,0 +1,5 @@
+###################### More Options ######################
+# If you want to have even more control, check out the documentation
+# https://github.com/fastlane/fastlane/blob/master/deliver/Deliverfile.md
+
+automatic_release false

fastlane/Fastfile

@@ -4,7 +4,9 @@
 # https://github.com/fastlane/fastlane/tree/master/fastlane/docs
 
 # Set a minimum version for fastlane
-fastlane_version '2.19.0'
+fastlane_version '2.50.1'
+
+require 'fileutils'
 
 import 'lib/before_all.rb'
 import 'lib/util.rb'

fastlane/README.md

@@ -29,26 +29,11 @@ xcode-select --install
 </table>
 
 # Available Actions
-### bump
+### keys
 ```
-fastlane bump
+fastlane keys
 ```
-Bump the version string to a new version
-### propagate-version
-```
-fastlane propagate-version
-```
-Copy the package.json version into the other version locations
-### release_notes
-```
-fastlane release_notes
-```
-Build the release notes: branch, commit hash, changelog
-### bundle_data
-```
-fastlane bundle_data
-```
-run `npm run bundle-data`
+Set up the private keys + environment variables for local development
 
 ----
 
@@ -62,17 +47,27 @@ Makes a build
 ```
 fastlane android beta
 ```
-Submit a new Beta Build to HockeyApp
+Submit a new Beta Build to Google Play
+### android nightly
+```
+fastlane android nightly
+```
+Submit a new nightly Build to Google Play
 ### android ci-run
 ```
 fastlane android ci-run
 ```
 Run the appropriate action on CI
-### android set_version
+### android ci-emulator
+```
+fastlane android ci-emulator
 ```
-fastlane android set_version
+Set up an android emulator on TravisCI
+### android matchesque
 ```
-Include the build number in the version string
+fastlane android matchesque
+```
+extract the android keys from the match repo
 
 ----
 
@@ -91,12 +86,17 @@ Take screenshots
 ```
 fastlane ios build
 ```
-Provisions the profiles; bumps the build number; builds the app
+Builds the app
 ### ios beta
 ```
 fastlane ios beta
 ```
 Submit a new Beta Build to Testflight
+### ios nightly
+```
+fastlane ios nightly
+```
+Submit a new nightly Beta Build to Testflight
 ### ios refresh_dsyms
 ```
 fastlane ios refresh_dsyms
@@ -107,11 +107,6 @@ Upload dYSM symbols to Bugsnag from Apple
 fastlane ios ci-run
 ```
 Run iOS builds or tests, as appropriate
-### ios set_version
-```
-fastlane ios set_version
-```
-Include the build number in the version string
 
 ----
 

fastlane/actions/get_gradle_version_code.rb

@@ -0,0 +1,45 @@
+module Fastlane
+  module Actions
+    class GetGradleVersionCodeAction < Action
+      def self.run(params)
+        gradle_path = params[:gradle_path]
+        version_code = nil
+
+        File.foreach(gradle_path) do |line|
+          if line.include? 'versionCode '
+            components = line.strip.split(' ')
+            version_code = components[1].tr('"', '')
+          end
+        end
+
+        if version_code.nil?
+          UI.user_error! "Could not find the version code in #{gradle_path}"
+        else
+          UI.success "Version code: #{version_code}"
+        end
+
+        version_code.to_i
+      end
+
+      def self.description
+        'Get the version code of your android project.'
+      end
+
+      def self.authors
+        ['Hawken Rives']
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(key: :gradle_path,
+                                       description: 'The path to the build.gradle file',
+                                       type: String),
+        ]
+      end
+
+      def self.is_supported?(platform)
+        [:android].include?(platform)
+      end
+    end
+  end
+end

fastlane/actions/set_gradle_version_code.rb

@@ -47,7 +47,8 @@ def self.available_options
           FastlaneCore::ConfigItem.new(key: :gradle_path,
                                        description: 'The path to the build.gradle file'),
           FastlaneCore::ConfigItem.new(key: :version_code,
-                                       description: 'The version to change to'),
+                                       description: 'The version to change to',
+                                       type: Integer),
         ]
       end
 

fastlane/lib/before_all.rb

@@ -1,4 +1,9 @@
 before_all do
+  case lane_context[:PLATFORM_NAME]
+  when :ios
+    setup_travis
+  end
+
   # too lazy to change the name in travis, so we jut copy it here
   ENV['FL_HOCKEY_API_TOKEN'] = ENV['HOCKEYAPP_TOKEN']
   ENV['FL_HOCKEY_COMMIT_SHA'] = ENV['TRAVIS_COMMIT']

fastlane/lib/util.rb

@@ -9,19 +9,21 @@ def authorize_ci_for_keys
   end
 end
 
-# Get the commit of the latest build on HockeyApp
-def hockeyapp_version_commit
-  latest_hockeyapp_notes[:commit_hash]
-end
-
 # Gets the version, either from Travis or from Hockey
-def current_build_number
+def current_build_number(**args)
   if ENV.key?('TRAVIS_BUILD_NUMBER')
     return ENV['TRAVIS_BUILD_NUMBER']
   end
 
   begin
-    (latest_testflight_build_number + 1).to_s
+    case lane_context[:PLATFORM_NAME]
+    when :android
+      (google_play_track_version_codes(track: args[:track]) + 1).to_s
+    when :ios
+      (latest_testflight_build_number + 1).to_s
+    else
+      UI.input "Please enter a build number: "
+    end
   rescue
     '1'
   end
@@ -40,6 +42,28 @@ def current_bundle_version
   end
 end
 
+# Copy the package.json version into the other version locations
+def propagate_version(**args)
+  version = get_package_key(key: :version)
+  build = current_build_number(track: args[:track] || nil)
+
+  UI.message "Propagating version: #{version}"
+  UI.message "into the Info.plist and build.gradle files"
+
+  # encode build number into js-land
+  set_package_data(data: {version: "#{version}+#{build}"})
+
+  case lane_context[:PLATFORM_NAME]
+  when :android
+    set_gradle_version_name(version_name: version, gradle_path: lane_context[:GRADLE_FILE])
+    set_gradle_version_code(version_code: build, gradle_path: lane_context[:GRADLE_FILE])
+  when :ios
+    # we're splitting here because iTC can't handle versions with dashes in them
+    increment_version_number(version_number: version.split('-')[0], xcodeproj: ENV['GYM_PROJECT'])
+    increment_build_number(build_number: build, xcodeproj: ENV['GYM_PROJECT'])
+  end
+end
+
 # Makes a changelog from the timespan passed
 def make_changelog
   to_ref = ENV['TRAVIS_COMMIT'] || 'HEAD'
@@ -55,14 +79,13 @@ def make_changelog
 # 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.
 def auto_beta
-  last_commit = hockeyapp_version_commit
-  current_commit = last_git_commit[:commit_hash]
-
-  UI.message 'In faux-git terms:'
-  UI.message "origin/hockeyapp: #{last_commit}"
-  UI.message "HEAD: #{current_commit}"
-  will_beta = last_commit != current_commit ? 'yes' : 'no'
-  UI.message "Thus, will we beta? #{will_beta}"
-
-  beta if last_commit != current_commit
+  if ENV['run_deploy'] == '1'
+    if ENV['TRAVIS_EVENT_TYPE'] == 'cron'
+      nightly
+    else
+      beta
+    end
+  else
+    build
+  end
 end

fastlane/metadata/android/en-US/changelogs/2.txt

@@ -0,0 +1,12 @@
+We can't wait to show you what we've been up to!
+
+In this version:
+- You can reorder the home screen now!
+- Check out the Northfield events calendar!
+- Discover new student orgs to join!
+- Meals Remaining in SIS is back!
+- Hours redesign! More buildings! More hours!
+- Menus redesign! Better menus! Faster loading!
+- There's a new FAQs section in Settings! Check it out.
+- The Pause Events calendar is now included!
+- Numerous Bug Fixes