chore(release): jctong/prepare release 3.1.0 beta (#213)

Author: juancarlostong

.travis.yml

@@ -74,10 +74,12 @@ jobs:
       os: osx
       osx_image: xcode10.1
       env:
-        - VERSION=3.0.2
+        - VERSION=3.1.0-beta
       install:
         # install hub
         - wget https://github.com/github/hub/releases/download/v2.11.2/hub-darwin-amd64-2.11.2.tgz -O /tmp/hub-darwin-amd64-2.11.2.tgz && tar -xvf /tmp/hub-darwin-amd64-2.11.2.tgz -C /usr/local/opt && ln -s /usr/local/opt/hub-darwin-amd64-2.11.2/bin/hub /usr/local/bin/hub
+        # upgrade cocoapods
+        - gem install cocoapods -v '1.6.1'
       script:
         - Scripts/run_prep.sh
 
@@ -87,9 +89,11 @@ jobs:
       os: osx
       osx_image: xcode10.1
       env:
-        - VERSION=3.0.2
+        - VERSION=3.1.0-beta
       install:
         # install hub
         - wget https://github.com/github/hub/releases/download/v2.11.2/hub-darwin-amd64-2.11.2.tgz -O /tmp/hub-darwin-amd64-2.11.2.tgz && tar -xvf /tmp/hub-darwin-amd64-2.11.2.tgz -C /usr/local/opt && ln -s /usr/local/opt/hub-darwin-amd64-2.11.2/bin/hub /usr/local/bin/hub
+        # upgrade cocoapods
+        - gem install cocoapods -v '1.6.1'
       script:
         - Scripts/run_release.sh

CHANGELOG.md

@@ -1,9 +1,9 @@
 # Optimizely Swift SDK Changelog
 
 ## 3.1.0-beta
-May 28, 2019
+May 30, 2019
 
-This the initial release of the Swift SDK. It is a pure Swift implementation take complete advantage of language features and performance.  It supports objective-C as well through objective-c only API. It uses Swift 4.2 but we will be upgrading to 5.0 soon.
+This is the initial release of the Swift SDK. It is a pure Swift implementation which takes complete advantage of language features and performance.  It supports Objective-C applications as well. It uses Swift 4.2 but we will be upgrading to 5.0 soon.
 
 This modernized version of the SDK is meant to replace the Objective-C SDK.
 
@@ -15,4 +15,3 @@ This modernized version of the SDK is meant to replace the Objective-C SDK.
 ### Bug Fixes:
 
 ### Breaking Changes
-

README.md

@@ -15,7 +15,7 @@ Optimizely Rollouts is free feature flags for development teams. Easily roll out
 
 ### Using the SDK
 
-See the [Mobile developer documentation](https://developers.optimizely.com/x/solutions/sdks/reference/index.html?language=swift&platform=mobile) or [OTT developer documentation](https://developers.optimizely.com/x/solutions/sdks/reference/index.html?language=swift&platform=ott) to learn how to set
+See the [Mobile developer documentation](https://docs.developers.optimizely.com/full-stack/docs/implement-the-ios-sdk-310-beta) or [OTT developer documentation](https://docs.developers.optimizely.com/full-stack/docs/implement-the-ios-sdk-310-beta) to learn how to set
 up an Optimizely X project and start using the SDK.
 
 ### Requirements
@@ -25,10 +25,10 @@ up an Optimizely X project and start using the SDK.
 
 Please note below that _\<platform\>_ is used to represent the platform on which you are building your app. Currently, we support ```iOS``` and ```tvOS``` platforms.
 
-#### Cocoapod 
+#### CocoaPods 
 1. Add the following lines to the _Podfile_:<pre>
 	```use_frameworks!```
-    ```pod 'OptimizelySwiftSDK', :git => 'https://github.com/optimizely/swift-sdk.git', :branch => 'master'```
+    ```pod 'OptimizelySwiftSDK', '3.1.0-beta'```
     </pre>
 
 2. Run the following command: <pre>``` pod install ```</pre>
@@ -38,7 +38,7 @@ Further installation instructions for Cocoapods: https://guides.cocoapods.org/us
 We haven't actually published to Cocoapods yet.  
 
 #### Carthage
-1. Add the following lines to the _Cartfile_:<pre>```github "optimizely/swift-sdk" "master"```</pre>
+1. Add the following lines to the _Cartfile_:<pre>```github "optimizely/swift-sdk" == 3.1.0-beta```</pre>
 
 2. Run the following command:<pre>```carthage update```</pre>
 

Scripts/run_prep.sh

@@ -43,7 +43,10 @@ function do_stuff {
   trap "kill $!" EXIT
   trap 'error_handler' ERR
 
-  myscripts=( "build_all.sh" "test_all.sh" "update_version.sh ${VERSION}" )
+  # we need pod install or test_all.sh fails
+  pod install
+
+  myscripts=( "update_version.sh ${VERSION}" "build_all.sh" "test_all.sh" )
   for i in "${myscripts[@]}"; do
     echo -n "${i} "
     Scripts/${i} >> $BUILD_OUTPUT 2>&1
@@ -57,7 +60,21 @@ function do_stuff {
 function push_changes {
   git config user.email "[email protected]"
   git config user.name "${GITHUB_USER}"
-  git add --all && git commit -m "ci(travis): auto release prep for $VERSION"
+  git add --all
+  # this is like a try/catch
+  git commit -m "ci(travis): auto release prep for $VERSION" ||
+    {
+      case $? in
+        1 )
+          echo -e "${COLOR_CYAN}INFO: ${COLOR_RESET}Nothing to commit, so not creating a PR"
+          exit 0
+          ;;
+        * )
+          echo -e "${COLOR_CYAN}ERROR: ${COLOR_RESET}Unexpected exit code while trying to git commit"
+          exit 1
+          ;;
+      esac
+    }
   git push https://${GITHUB_TOKEN}@github.com/${TRAVIS_REPO_SLUG} ${AUTOBRANCH}
   PR_URL=$(hub pull-request --no-edit -b ${TRAVIS_BRANCH})
   echo -e "${COLOR_CYAN}ATTENTION:${COLOR_RESET} review and merge ${COLOR_CYAN}${PR_URL}${COLOR_RESET}"

Scripts/run_release.sh

@@ -20,7 +20,7 @@ function release_github {
   NEW_VERSION=$(grep '^## \d\+\.\d\+.\d\+' ${CHANGELOG} | awk 'NR==1')
   LAST_VERSION=$(grep '^## \d\+\.\d\+.\d\+' ${CHANGELOG} | awk 'NR==2')
 
-  DESCRIPTION=$(awk "/^${NEW_VERSION}$/,/^${LAST_VERSION}$/" ${CHANGELOG} | grep -v "^${LAST_VERSION}$")
+  DESCRIPTION=$(awk "/^${NEW_VERSION}$/,/^${LAST_VERSION:-nothingmatched}$/" ${CHANGELOG} | grep -v "^${LAST_VERSION:-nothingmatched}$")
 
   hub release create v${VERSION} -m "Release ${VERSION}" -m "${DESCRIPTION}"
 

Scripts/update_version.sh

@@ -71,4 +71,4 @@ if [ "${vm}" == "${releaseSDKVersion}" ]; then
     printf "\t[${curPodSpec}] Verified podspec: ${vm} === ${releaseSDKVersion}\n"
 fi
 
-printf "\n\n[SUCCESS] All release-skd-version settings have been updated successfully!\n\n\n"
+printf "\n\n[SUCCESS] All release-sdk-version settings have been updated successfully!\n\n\n"