message: travis: also merge develop into master
diff: set -e
  -# We want to create a git tag when the version file changes.
  +git_branch=`git branch`
  +
  +# Make sure we're on the 'develop' branch.
  +if [ ! $git_branch = "develop" ]; then
  + echo "Error: branch is '$git_branch' instead of 'develop'"
  + exit 1
  +fi
  +
  +# We want to create a git tag when the version file changes, and also merge
  +# the latest 'develop' branch into the 'master' branch.
  # Read the version file.
  version_file=`cat version`
  @@ -18,6 +27,8 @@ if [ "$version_file" = "$version_tag" ]; then
  else
  new_tag="v$version_file"
  echo "Tags don't match, adding new tag $new_tag"
  + git checkout master
  + git merge -ff-only develop
  git tag $new_tag
  - git push origin $new_tag --dry-run
  + git push origin master $new_tag --dry-run
  fi
  