diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-02-12 21:58:36 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-02-12 22:37:20 +1000 |
| commit | 50adf9893b80a6c63fd10ab4ab6d58a711e40784 (patch) | |
| tree | 055e320606469ea4f937dc019dba9af4aa2648a3 /scripts | |
| parent | 7910508d1071e0e769ff6e291d3a1c479a067262 (diff) | |
| download | scala-50adf9893b80a6c63fd10ab4ab6d58a711e40784.tar.gz scala-50adf9893b80a6c63fd10ab4ab6d58a711e40784.tar.bz2 scala-50adf9893b80a6c63fd10ab4ab6d58a711e40784.zip | |
Update to partest 1.0.13
Which lets us remove the dependency on sbt-partest-interface,
as this has been incorporated into scala-partest itself.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/jobs/integrate/bootstrap | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/scripts/jobs/integrate/bootstrap b/scripts/jobs/integrate/bootstrap index 410fe573f8..f1795457df 100755 --- a/scripts/jobs/integrate/bootstrap +++ b/scripts/jobs/integrate/bootstrap @@ -238,15 +238,6 @@ buildPartest() { fi } -# buildPartestIface() { -# if [ "$forceRebuild" != "yes" ] && ( sbtResolve "org.scala-lang.modules" "scala-partest-interface" $PARTEST_IFACE_VER ) -# then echo "Found scala-partest-interface $PARTEST_IFACE_VER; not building." -# else -# update scala scala-partest-interface "$PARTEST_IFACE_REF" && gfxd -# sbtBuild 'set version :="'$PARTEST_IFACE_VER'"' $clean "${buildTasks[@]}" -# fi -# } - buildSwing() { if [ "$SWING_BUILT" != "yes" ] && [ "$forceRebuild" != "yes" ] && ( sbtResolve "org.scala-lang.modules" "scala-swing" $SWING_VER ) then echo "Found scala-swing $SWING_VER; not building." @@ -277,7 +268,6 @@ buildModules() { buildSwing buildScalacheck buildPartest - # buildPartestIface } buildPublishedModules() { @@ -287,7 +277,6 @@ buildPublishedModules() { buildParsers buildSwing buildPartest - # buildPartestIface } @@ -400,7 +389,6 @@ deriveModuleVersions() { PARSERS_REF="v$PARSERS_VER" SWING_REF="v$SWING_VER" PARTEST_REF="v$PARTEST_VER" - # PARTEST_IFACE_REF="v$PARTEST_IFACE_VER" SCALACHECK_REF="$SCALACHECK_VER" # no `v` in their tags else # use HEAD as default when no revision is specified on the command line @@ -408,7 +396,6 @@ deriveModuleVersions() { PARSERS_REF=${PARSERS_REF-"HEAD"} SWING_REF=${SWING_REF-"HEAD"} PARTEST_REF=${PARTEST_REF-"HEAD"} - # PARTEST_IFACE_REF=${PARTEST_IFACE_REF-"HEAD"} SCALACHECK_REF=${SCALACHECK_REF-"HEAD"} XML_VER=$(deriveVersion scala scala-xml "$XML_REF") @@ -425,7 +412,6 @@ deriveModuleVersions() { echo "SWING = $SWING_VER at $SWING_REF" echo "XML = $XML_VER at $XML_REF" - # PARTEST_IFACE_VER=${PARTEST_IFACE_VER-$(deriveVersion scala scala-partest-interface "$PARTEST_IFACE_REF")} } createNetrcFile() { |