diff options
Diffstat (limited to 'scripts/jobs')
| -rwxr-xr-x | scripts/jobs/integrate/bootstrap | 4 | ||||
| -rwxr-xr-x | scripts/jobs/integrate/ide | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/scripts/jobs/integrate/bootstrap b/scripts/jobs/integrate/bootstrap index d0a5b452a8..0c1221d8eb 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 @@ -320,7 +320,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/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 |