bump travis ruby and build www in a pr

Signed-off-by: mwrock <matt@mattwrock.com>

.travis.yml

@@ -18,14 +18,14 @@ matrix:
 # Job for building and deploying the web site
 #
     - language: ruby
-      rvm: 2.3.3
+      rvm: 2.5.3
       sudo: false
       cache:
         bundle: true
         directories:
           - www/build
       env:
-        - AFFECTED_FILES=""
+        - AFFECTED_FILES="support/ci/deploy_website.sh"
         - AFFECTED_DIRS="www"
         - AWS_BUCKET=habitat-www
         - AWS_DEFAULT_REGION=us-west-2

support/ci/deploy_website.sh

@@ -6,10 +6,14 @@ if [[ "${TRAVIS_PULL_REQUEST}" = "false" ]] && [[ "${TRAVIS_BRANCH}" = "master"
   echo "We are not on a PR and on the master branch. Going to deploy the site."
   cd www
   make deploy
+elif [[ "${TRAVIS_PULL_REQUEST}" = "false" ]] && [[ "${TRAVIS_BRANCH}" =~ ^acceptance_deploy ]]; then
+  echo "We are not on a PR and on an acceptance_deploy branch. Deploying to Acceptance."
+  cd www
+  BUILDER_WEB_URL="https://bldr.acceptance.habitat.sh" GITHUB_APP_URL="https://github.com/apps/habitat-builder-acceptance" make acceptance
+elif [[ "${TRAVIS_PULL_REQUEST}" != "false" ]]; then
+  echo "We are on a PR. Going to just build the site."
+  cd www
+  make build
 else
-  if [[ "${TRAVIS_PULL_REQUEST}" = "false" ]] && [[ "${TRAVIS_BRANCH}" =~ ^acceptance_deploy ]]; then
-    echo "We are on a PR or against the master branch. Deploying to Acceptance."
-    cd www
-    BUILDER_WEB_URL="https://bldr.acceptance.habitat.sh" GITHUB_APP_URL="https://github.com/apps/habitat-builder-acceptance" make acceptance
-  fi
+  echo "Not building web site."
 fi

www/Makefile

@@ -1,5 +1,7 @@
 build: clean
-	gem install bundler
+    # See https://bundler.io/blog/2019/01/04/an-update-on-the-bundler-2-release.html
+	# Due to bug in ruby 2.x, need to install same version of bundler lock file was built with
+	gem install bundler --version 2.0.1
 	bundle install
 	bundle exec middleman build --no-parallel
 .PHONY: build