3 files changed, 62 insertions, 2 deletions
diff --git a/scripts/jobs/integrate/bootstrap b/scripts/jobs/integrate/bootstrap
index 7944ab3fd3..34cca4e980 100755
--- a/scripts/jobs/integrate/bootstrap
+++ b/scripts/jobs/integrate/bootstrap
@@ -33,7 +33,7 @@
 # $SCALA_VER_BASE$SCALA_VER_SUFFIX (if former variable is set)
 # By parsing the tag (if HEAD is tagged as v$base$suffix)
 # By parsing build.number for the base version, suffixing with -$sha-nightly
-# Serialize these versions to jenkins.properties, which are passed downstream to scala-release-2.11.x-dist.
+# Serialize these versions to jenkins.properties, which are passed downstream to scala-release-2.12.x-dist.
 # This also removes the need to tag scala/scala-dist (not possible for nightlies, still encouraged for releases, but not a hard requirement).
 #
 # Determine Module Versions
@@ -334,7 +334,7 @@ determineScalaVersion() {
 
       # TODO: publish nightly snapshot using this script
       publishToSonatype="no"
-      echo "repo_ref=2.11.x" >> $baseDir/jenkins.properties # for the -dist downstream jobs that build the actual archives
+      echo "repo_ref=2.12.x" >> $baseDir/jenkins.properties # for the -dist downstream jobs that build the actual archives
     else
       echo "HEAD is tagged as $scalaTag."
       # borrowed from https://github.com/cloudflare/semver_bash/blob/master/semver.sh
diff --git a/scripts/jobs/integrate/bootstrap-2.12.0-M0 b/scripts/jobs/integrate/bootstrap-2.12.0-M0
new file mode 100755
index 0000000000..686f6615af
--- /dev/null
+++ b/scripts/jobs/integrate/bootstrap-2.12.0-M0
@@ -0,0 +1,57 @@
+#!/bin/bash -e
+
+baseDir=`pwd`
+cd $baseDir
+
+scriptsDir="$baseDir/scripts"
+. $scriptsDir/common
+
+./pull-binary-libs.sh
+
+privateRepo="http://private-repo.typesafe.com/typesafe/scala-release-temp/"
+privateCred="private-repo"
+
+publishLockerPrivateTask="publish"
+publishPrivateTask="publish"
+publishSonatypeTaskCore="publish-signed"
+
+antBuildTask="nightly"
+
+SCALA_VER_BASE="2.12.0"
+SCALA_VER_SUFFIX="-M0"
+SCALA_VER="$SCALA_VER_BASE$SCALA_VER_SUFFIX"
+
+SCALA_BINARY_VER="2.11" # defines the binary version of the used modules. using 2.11 modules for this first 2.12 release.
+CONTINUATIONS_PLUGIN_VER_SUFFIX="_2.11.5"
+
+SCALADOC_SOURCE_LINKS_VER="v$SCALA_VER"
+
+rm -rf build/
+
+ant -Dmaven.version.number=$SCALA_VER\
+    -Dremote.snapshot.repository=NOPE\
+    -Dremote.release.repository=$privateRepo\
+    -Drepository.credentials.id=$privateCred\
+    -Dscalac.args.optimise=-optimise\
+    -Ddocs.skip=1\
+    -Dlocker.skip=1\
+    $publishLockerPrivateTask
+
+rm -rf build/
+
+ant -Dstarr.version=$SCALA_VER\
+    -Dscala.full.version=$SCALA_VER\
+    -Dextra.repo.url=$privateRepo\
+    -Dmaven.version.suffix=$SCALA_VER_SUFFIX\
+    -Dscala.binary.version=$SCALA_BINARY_VER\
+    -Dscala-continuations-plugin.cross.suffix=$CONTINUATIONS_PLUGIN_VER_SUFFIX\
+    -Dscaladoc.git.commit=$SCALADOC_SOURCE_LINKS_VER\
+    -Dremote.snapshot.repository=NOPE\
+    -Dremote.release.repository=$privateRepo\
+    -Drepository.credentials.id=$privateCred\
+    -Dscalac.args.optimise=-optimise\
+    $antBuildTask $publishPrivateTask
+
+if [ "$publishToSonatype" == "yes" ]; then
+  ant -Dmaven.version.number=$SCALA_VER $publishSonatypeTaskCore
+fi
diff --git a/scripts/jobs/integrate/ide b/scripts/jobs/integrate/ide
index 5c1e6199e3..447f34f937 100755
--- a/scripts/jobs/integrate/ide
+++ b/scripts/jobs/integrate/ide
@@ -3,6 +3,9 @@
 # requires env: scalaVersion (specifies binary already built from above checkout), WORKSPACE (provided by jenkins), repo_ref (HEAD of the scala checkout),
 # requires files: $baseDir/versions.properties (from checkout -- defines version numbers for modules used to build scala for dbuild...)
 
+echo "IDE integration not yet available on 2.12.x. Punting."
+exit 0
+
 # TODO: remove when integration is up and running
 if [ "woele$_scabot_last" != "woele1" ]; then echo "Scabot didn't mark this as last commit -- skipping."; exit 0; fi