diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-02-12 21:58:36 +1000 |
|---|---|---|
| committer | Stefan Zeiger <szeiger@novocode.com> | 2016-02-17 18:24:45 +0100 |
| commit | 3effcd232f0e3be32a8ee8f7b9eda832639e4f21 (patch) | |
| tree | b08e34154e2c276a552c94a46814ae4921f19ee1 /scripts | |
| parent | e606e3054a2d872135b6409f43291d5746a48cf1 (diff) | |
| download | scala-3effcd232f0e3be32a8ee8f7b9eda832639e4f21.tar.gz scala-3effcd232f0e3be32a8ee8f7b9eda832639e4f21.tar.bz2 scala-3effcd232f0e3be32a8ee8f7b9eda832639e4f21.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.
Conflicts:
scripts/jobs/integrate/bootstrap
Diffstat (limited to 'scripts')
| -rw-r--r--[-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 cbb8e1026b..a81c672d6e 100755..100644 --- 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 -# } - buildContinuations() { if [ "$CONT_PLUG_BUILT" != "yes" ] && [ "$forceRebuild" != "yes" ] && ( sbtResolve "org.scala-lang.plugins" "scala-continuations-plugin" $CONTINUATIONS_VER full ) then echo "Found scala-continuations-plugin $CONTINUATIONS_VER; not building." @@ -312,7 +303,6 @@ buildModules() { buildActorsMigration buildScalacheck buildPartest - # buildPartestIface } buildPublishedModules() { @@ -324,7 +314,6 @@ buildPublishedModules() { buildSwing buildActorsMigration buildPartest - # buildPartestIface } @@ -441,7 +430,6 @@ deriveModuleVersions() { SWING_REF="v$SWING_VER" ACTORS_MIGRATION_REF="v$ACTORS_MIGRATION_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 @@ -451,7 +439,6 @@ deriveModuleVersions() { SWING_REF=${SWING_REF-"HEAD"} ACTORS_MIGRATION_REF=${ACTORS_MIGRATION_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") @@ -472,7 +459,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() { |