Merge pull request #19 from lrytz/merge-2.12

Merge 2.12

Author: lrytz

Diff for: .travis.yml

@@ -0,0 +1,32 @@
+language: scala
+
+jdk: oraclejdk8
+
+env:
+  global:
+    # GITHUB_OAUTH_TOKEN (for GitHub user scala-jenkins, same token as scabot)
+    secure: "ErMvEJv2oDyQqclA0IM78thPkZG+0kjBSIKbDtI/PIoaoxMKi+gtsYH92/JFU26oNfDwgqh3B0QwU2niyK3TO0P0xjmrYsvlMXjDwgHX/w+hw7GuIXUp4r8/V1nyNF+9OGlHtNbtbDtFilThI2osS+/G304cNsE4GVa9LRxhzpQ="
+
+script:
+  - source scripts/common
+  - if [[ "$scala_sha" != "" ]]; then postCommitStatus "pending"; fi
+  - scripts/jobs/release/smoketest
+
+after_script:
+  - |
+    if [[ "$scala_sha" != "" ]]; then
+      if [[ "$TRAVIS_TEST_RESULT" == "0" ]]; then
+        local state="success"
+      else
+        local state="failure"
+      fi
+      postCommitStatus $state
+    fi
+
+cache:
+  directories:
+    - $HOME/.ivy2/cache
+    - $HOME/.sbt
+before_cache:
+  - find $HOME/.ivy2/cache -name "ivydata-*.properties" -print -delete
+  - find $HOME/.sbt        -name "*.lock"               -print -delete

Diff for: scripts/common

@@ -0,0 +1,29 @@
+# https://github.com/travis-ci/docs-travis-ci-com/issues/949
+function travis_fold_start() {
+  echo ""
+  echo -e "travis_fold:start:$1\033[33;1m$2\033[0m"
+}
+
+function travis_fold_end() {
+  echo -e "\ntravis_fold:end:$1\r"
+  echo ""
+}
+
+# Params:
+#   - state: pending / success / failed / error
+function postCommitStatus() {
+  local jsonTemplate='{ "state": "%s", "target_url": "%s", "description": "%s", "context": "%s"}'
+  local json=$(printf "$jsonTemplate" "$1" "https://travis-ci.org/scala/scala-dist-smoketest/builds/$TRAVIS_BUILD_ID" "$1" "travis/scala-dist-smoketest/$version")
+
+  local curlStatus=$(curl \
+    -s -o /dev/null -w "%{http_code}" \
+    -H "Accept: application/vnd.github.v3+json" \
+    -H "Authorization: token $GITHUB_OAUTH_TOKEN" \
+    -d "$json" \
+    https://api.github.com/repos/scala/scala/statuses/$scala_sha)
+
+  [[ "$curlStatus" == "201" ]] || {
+    echo "Failed to publish GitHub commit status"
+    exit 1
+  }
+}

Diff for: scripts/jobs/release/smoketest

@@ -1,12 +1,35 @@
 #!/bin/bash -ex
 
-# This script requires sbtDistVersionOverride=-Dproject.version=...
+function ensureVersion() {
+  local verPat="[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9-]+)?"
+  [[ "$version" =~ $verPat ]] || {
+    echo "Not a valid Scala version: '$version'"
+    exit 1
+  }
+}
+
+clearIvyCache() {
+  rm -fv $HOME/.ivy2/exclude_classifiers $HOME/.ivy2/exclude_classifiers.lock
+  rm -rfv $HOME/.ivy2/cache/org.scala-lang $HOME/.ivy2/cache/org.scala-lang.modules
+  rm -rfv $HOME/.ivy2/local/org.scala-lang $HOME/.ivy2/local/org.scala-lang.modules
+  if [ -d $HOME/.ivy2 ]; then find $HOME/.ivy2 -name "*compiler-interface*$version*" | xargs rm -rfv; fi
+  if [ -d $HOME/.sbt ]; then find $HOME/.sbt -name "*compiler-interface*$version*" | xargs rm -rfv; fi
+}
+
+if [[ "$TRAVIS_EVENT_TYPE" == "api" ]]; then
+  ensureVersion
+else
+  # Use some recent version to validate changes in smoketest itself
+  version="2.12.4"
+fi
+
+clearIvyCache
 
-rm -rf $WORKSPACE/ivy2
+sbtDistVersionOverride="-Dproject.version=$version"
 
 integrationRepoUrl=${integrationRepoUrl-"https://scala-ci.typesafe.com/artifactory/scala-integration/"}
 
-sbt -Dsbt.log.noformat=true -Dsbt.ivy.home=$WORKSPACE/ivy2 \
+sbt -Dsbt.log.noformat=true \
   "set resolvers += \"scala-integration\" at \"$integrationRepoUrl\"" \
   $sbtDistVersionOverride \
   clean run