diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2016-09-29 16:04:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-29 16:04:27 -0700 |
| commit | 40872a5254e4b4ef56b6d7aa37dda4e85d1bd1ba (patch) | |
| tree | ca48ca8c09d56338380875d20d03062a53d1d969 | |
| parent | 1615ce9eb406c6c9de608900a3338ac715caabc6 (diff) | |
| parent | da660071143de9ec763b47a9c67c0623b4b4edc6 (diff) | |
| download | scala-40872a5254e4b4ef56b6d7aa37dda4e85d1bd1ba.tar.gz scala-40872a5254e4b4ef56b6d7aa37dda4e85d1bd1ba.tar.bz2 scala-40872a5254e4b4ef56b6d7aa37dda4e85d1bd1ba.zip | |
Merge pull request #5437 from SethTisue/spec-2.12
make the 2.12 spec available on scala-lang.org
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | spec/README.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 236e002a5e..42099ec988 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,4 +20,4 @@ after_success: - openssl aes-256-cbc -pass "pass:$PRIV_KEY_SECRET" -in spec/id_dsa_travis.enc -out spec/id_dsa_travis -d -a - chmod 600 spec/id_dsa_travis - eval "$(ssh-agent)" - - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && ssh-add -D && ssh-add spec/id_dsa_travis && rsync -e "ssh -o StrictHostKeyChecking=no" -rzv build/spec/ scalatest@chara.epfl.ch:/home/linuxsoft/archives/scala/spec/2.11/' + - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && ssh-add -D && ssh-add spec/id_dsa_travis && rsync -e "ssh -o StrictHostKeyChecking=no" -rzv build/spec/ scalatest@chara.epfl.ch:/home/linuxsoft/archives/scala/spec/2.12/' diff --git a/spec/README.md b/spec/README.md index 1a201fc97c..9fd7c9f6ae 100644 --- a/spec/README.md +++ b/spec/README.md @@ -12,7 +12,7 @@ We use Jekyll 2 and [Redcarpet](https://github.com/vmg/redcarpet) to generate th ## Building -Travis CI builds the spec automatically on every commit to master and publishes to http://www.scala-lang.org/files/archive/spec/2.11/. +Travis CI builds the spec automatically after every merged pull release and publishes to http://www.scala-lang.org/files/archive/spec/2.12/. To preview locally, run `bundle exec jekyll serve -d build/spec/ -s spec/ -w --baseurl=""` (in the root of your checkout of scala/scala), and open http://0.0.0.0:4000/. Jekyll will rebuild as you edit the markdown, but make sure to restart it when you change `_config.yml`. |