Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/2.11.x' into 2.12.x | Seth Tisue | 2015-09-08 | 1 | -3/+3 |
| | | | | | | | | only trivial merge conflicts here. not dealing with PR #4333 in this merge because there is a substantial conflict there -- so that's why I stopped at 63daba33ae99471175e9d7b20792324615f5999b for now | ||||
* | remove temporary XML coalescing hack we used to build M2 | Seth Tisue | 2015-07-21 | 1 | -2/+1 |
| | | | | | | | scala-xml 1.0.5 has the fix we need in order to run the scala-xml tests normally during bootstrapping. reverts 83554a3c0fb2b57efa293efcc81a947b98a19469 | ||||
* | Bootstrap scala-xml using `-Xsource:2.11` | Adriaan Moors | 2015-07-08 | 1 | -1/+2 |
| | | | | | | Under 2.12 source level, `scala.xml.XMLTest.escape` fails (see #4451) https://scala-ci.typesafe.com/job/scala-2.12.x-integrate-bootstrap/60/artifact/logs/builds/*view*/ | ||||
* | Enable the new optimizer when building scala | Lukas Rytz | 2015-07-03 | 2 | -3/+3 |
| | | | | | | | No change in build.sbt, there's no optimizer settings there yet. Ignore the inliner warning in presentation/t7678 and run/t8029.scala, noted in https://issues.scala-lang.org/browse/SI-9378 | ||||
* | Merge commit '297eeb3' into merge-2.11-may-12 | Lukas Rytz | 2015-05-12 | 1 | -3/+4 |
|\ | |||||
| * | Subst repo.typesafe -> dl.bintray, use jcenter cache | Adriaan Moors | 2015-05-08 | 1 | -3/+4 |
| | | | | | | | | | | | | | | Switch to https while we're at it, and remove duplicate entry for sbt-plugin-releases (NOTE: 'organization' <-> 'organisation', see http://ant.apache.org/ivy/history/latest-milestone/concept.html#patterns) | ||||
| * | [backport] Fixes a comment in the bootstrap script. | Lukas Rytz | 2015-05-06 | 1 | -9/+11 |
| | | | | | | | | Backport of 48328cc2a2ae26cf6d6cec5da30605b1be6f0990 | ||||
| * | [backport] Remove existing builds from private-repo before building a release. | Lukas Rytz | 2015-05-06 | 1 | -0/+25 |
| | | | | | | | | Backport of 1a292c3d0fe10699837a02ffd8adc3ea4d3a6d22 | ||||
| * | [backport] Revert back to Scalacheck 1.11.x, fixes to bootstrap script | Adriaan Moors | 2015-05-06 | 1 | -14/+18 |
| | | | | | | | | | | | | | | | | | | | | | | 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. Backport of f238586d1b9d93533ee9507b56a26a97c2b2501c | ||||
| * | [backport] remove references to private-repo.typesafe.com | Lukas Rytz | 2015-05-06 | 1 | -19/+6 |
| | | | | | | | | Backport of 9cd3e6505aa4285750e63263e2551ab71f36ff8d | ||||
| * | [backport] Documentation and some updates for the release build script | Lukas Rytz | 2015-05-06 | 1 | -107/+150 |
| | | | | | | | | Backport of 7b54922b77fe1cf40177fc4a5ee9707bb5d854d2 | ||||
| * | [backport] Remove starr.use.released property (not in use anymore) | Lukas Rytz | 2015-05-06 | 1 | -1/+1 |
| | | | | | | | | Backport of 3b2abdf6af87debdfb01f22f185d2a35852218fc | ||||
* | | Merge commit '1b7e660' into merge-2.11-may-12 | Lukas Rytz | 2015-05-12 | 1 | -1/+1 |
|\| | |||||
| * | PR validation publishes zinc to $prRepoUrl | Adriaan Moors | 2015-05-01 | 1 | -1/+1 |
| | | | | | | | | Companion to https://github.com/scala-ide/uber-build/pull/73 | ||||
* | | Update versions.properties after 2.12.0-M1 | Lukas Rytz | 2015-05-05 | 1 | -9/+11 |
| | | | | | | | | | | | | Use 2.12.0-M1 as starr. Also fixes comment in the bootstrap script. | ||||
* | | Remove existing builds from private-repo before building a release. | Lukas Rytz | 2015-05-01 | 1 | -0/+25 |
| | | |||||
* | | Revert back to Scalacheck 1.11.x, fixes to bootstrap script | Adriaan Moors | 2015-05-01 | 1 | -14/+16 |
| | | | | | | | | | | | | | | | | | | 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. | ||||
* | | Remove akka-actor from scala-library-all | Lukas Rytz | 2015-04-30 | 1 | -2/+1 |
| | | | | | | | | The 2.12 distribution will no longer ship an akka-actors jar. | ||||
* | | remove references to private-repo.typesafe.com | Lukas Rytz | 2015-04-30 | 1 | -19/+6 |
| | | |||||
* | | Documentation and some updates for the release build script | Lukas Rytz | 2015-04-23 | 1 | -104/+146 |
| | | |||||
* | | Remove the 2.12.0-M0 bootstrap script - that was a mistake. | Lukas Rytz | 2015-04-23 | 1 | -57/+0 |
| | | |||||
* | | Remove scala.actors and the actors migration module dependency | Lukas Rytz | 2015-04-23 | 1 | -19/+0 |
| | | |||||
* | | Remove the continuations plugin module dependency | Lukas Rytz | 2015-04-23 | 1 | -33/+2 |
| | | |||||
* | | Remove starr.use.released property (not in use anymore) | Lukas Rytz | 2015-04-23 | 1 | -1/+1 |
| | | |||||
* | | Merge commit '555f8f0' into merge/2.11-to-2.12-apr-21 | Lukas Rytz | 2015-04-21 | 2 | -16/+23 |
|\| | |||||
| * | Derive repository info from (jenkins) env vars | Adriaan Moors | 2015-04-16 | 2 | -16/+23 |
| | | | | | | | | | | | | | | | | | | Since we're moving to bintray, first centralizing the config of the repositories we use while bootstrapping a release. This should not be hardcoded in scala/scala anyway, it's an implementation detail of our infrastructure, which is defined by scala/scala-jenkins-infra. | ||||
* | | Merge pull request #4425 from lrytz/script-2.12.0-M0 | Lukas Rytz | 2015-04-10 | 1 | -0/+57 |
|\ \ | | | | | | | release script for 2.12.0-M0 | ||||
| * | | release script for 2.12.0-M0 | Lukas Rytz | 2015-04-01 | 1 | -0/+57 |
| | | | |||||
* | | | Merge commit 'f25a78e' into merge/2.11-to-2.12-apr-1 | Lukas Rytz | 2015-04-01 | 1 | -1/+3 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Set scala.full.version during bootstrap, | Adriaan Moors | 2015-03-02 | 1 | -1/+3 |
| | | | | | | | | | | so that scala-dist depends on the correctly cross-versioned scala-continuations-plugin. | ||||
* | | Punt on IDE validation in 2.12.x... | Adriaan Moors | 2015-02-02 | 1 | -0/+3 |
| | | | | | | | | ... until https://github.com/scala-ide/uber-build/issues/48 is fixed. | ||||
* | | Refer to 2.12 in new release scripts | Jason Zaugg | 2015-01-29 | 1 | -2/+2 |
|/ | |||||
* | IDE validation: run on last commit | Adriaan Moors | 2015-01-27 | 1 | -0/+32 |
| | |||||
* | New PR validation | Adriaan Moors | 2015-01-21 | 4 | -71/+217 |
| | |||||
* | TODO notes for release script | Adriaan Moors | 2015-01-04 | 1 | -0/+5 |
| | |||||
* | Towards travis-style CI | Adriaan Moors | 2014-12-29 | 2 | -290/+87 |
| | | | | | | | | | | Move script to the repo it acts on, out of scala/jenkins-scripts Had to make some changes: - scala checkout is now in root ($WORKSPACE) - credentials are actually in homedir (sonatype/private-repo) - inline pr-scala-common - don't run tests for actors-migration due to timeout (TODO: revert?) | ||||
* | Import scripts verbatim from jenkin-scripts | Adriaan Moors | 2014-12-29 | 4 | -0/+875 |