Skip to content

Commit

Permalink
Revert back to Scalacheck 1.11.x, fixes to bootstrap script
Browse files Browse the repository at this point in the history
Scalacheck 1.12.x cross-compiles to JS and will take more work to
integrate.

Make sure we never attempt to publish scalacheck to sonatype.

Force checkout module refs in case of dirty workspace.
  • Loading branch information
adriaanm authored and lrytz committed May 1, 2015
1 parent 00b5adf commit f238586
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 15 deletions.
30 changes: 16 additions & 14 deletions scripts/jobs/integrate/bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ update() {
cd $2

git fetch --tags "https://github.com/$1/$2.git"
(git fetch "https://github.com/$1/$2.git" $3 && git checkout -q FETCH_HEAD) #|| git checkout -q $3 # || fallback is for local testing on tag
(git fetch "https://github.com/$1/$2.git" $3 && git checkout -fq FETCH_HEAD) #|| git checkout -fq $3 # || fallback is for local testing on tag
git reset --hard
}

Expand Down Expand Up @@ -258,18 +258,21 @@ buildSwing() {
fi
}

# should only be called with publishTasks publishing to private-repo
buildScalacheck(){
if [ "$SCALACHECK_BUILT" != "yes" ] && [ "$forceRebuild" != "yes" ] && ( sbtResolve "org.scalacheck" "scalacheck" $SCALACHECK_VER )
then echo "Found scalacheck $SCALACHECK_VER; not building."
else
update rickynils scalacheck $SCALACHECK_REF && gfxd
sbtBuild 'set version := "'$SCALACHECK_VER'"' 'set VersionKeys.scalaParserCombinatorsVersion := "'$PARSERS_VER'"' $clean $publishPrivateTask # test times out NOTE: never published to sonatype
sbtBuild 'set version := "'$SCALACHECK_VER'"' 'set VersionKeys.scalaParserCombinatorsVersion := "'$PARSERS_VER'"' $clean publish # test times out NOTE: never published to sonatype
SCALACHECK_BUILT="yes"
fi
}

# build modules, using ${buildTasks[@]} (except for Scalacheck, which is hard-coded to publish to private-repo)
buildModules() {
publishTasks=('set credentials += Credentials(Path.userHome / ".credentials-private-repo")' "set every publishTo := Some(\"private-repo\" at \"$releaseTempRepoUrl\")")
buildTasks=($publishPrivateTask)
buildXML
buildParsers
buildSwing
Expand All @@ -278,6 +281,16 @@ buildModules() {
# buildPartestIface
}

buildPublishedModules() {
publishTasks=('set credentials += Credentials(Path.userHome / ".credentials-sonatype")' "set pgpPassphrase := Some(Array.empty)")
buildTasks=($publishSonatypeTaskModules)
buildXML
buildParsers
buildSwing
buildPartest
# buildPartestIface
}


## BUILD STEPS:

Expand Down Expand Up @@ -466,8 +479,6 @@ bootstrap() {
# publish to our internal repo (so we can resolve the modules in the scala build below)
# we only need to build the modules necessary to build Scala itself
# since the version of locker and quick are the same
publishTasks=('set credentials += Credentials(Path.userHome / ".credentials-private-repo")' "set every publishTo := Some(\"private-repo\" at \"$releaseTempRepoUrl\")")
buildTasks=($publishPrivateTask)
buildModules

constructUpdatedModuleVersions
Expand Down Expand Up @@ -521,9 +532,7 @@ publishSonatype() {
# (was hoping we could make everything go to the same staging repo, but it's not timing that causes two staging repos to be opened)
# NOTE: only publish those for which versions are set
# test and publish to sonatype, assuming you have ~/.sbt/0.13/sonatype.sbt and ~/.sbt/0.13/plugin/gpg.sbt
publishTasks=('set credentials += Credentials(Path.userHome / ".credentials-sonatype")' "set pgpPassphrase := Some(Array.empty)")
buildTasks=($publishSonatypeTaskModules)
buildModules
buildPublishedModules

open=$(st_stagingReposOpen)
allOpenUrls=$(echo $open | jq '.repositoryURI' | tr -d \")
Expand All @@ -547,11 +556,4 @@ bootstrap

if [ "$publishToSonatype" == "yes" ]
then publishSonatype
else # build modules one more time, just to mimic the regular build as much when running as nightly
echo "### Rebuilding modules with quick, publishing to $baseDir/ivy/local"
buildTasks=(publish-local)
# buildScalacheck always uses publishPrivateTask (not buildTasks). we override it to avoid publishing to private-repo.
publishPrivateTask="publish-local"
forceRebuild="yes"
buildModules
fi
2 changes: 1 addition & 1 deletion versions.properties
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jline.version=2.12.1

# external modules, used internally (not shipped)
partest.version.number=1.0.7
scalacheck.version.number=1.12.2
scalacheck.version.number=1.11.6

# TODO: modularize the compiler
#scala-compiler-doc.version.number=1.0.0-RC1
Expand Down

0 comments on commit f238586

Please sign in to comment.