Merge pull request #2305 from dotty-staging/fix/publishing-docs

Make .drone.yml matrix more flexible

Author: felixmulder

.drone.yml

@@ -3,6 +3,8 @@
 # - Install [drone-cli](http://readme.drone.io/usage/getting-started-cli/)
 # - Copy your token from  http://dotty-ci.epfl.ch/account (Click SHOW TOKEN)
 # - (export DRONE_TOKEN=your-token; export DRONE_SERVER=http://dotty-ci.epfl.ch; drone sign lampepfl/dotty)
+#
+# Please note that the signing can only be done by collaborators.
 
 pipeline:
   test:
@@ -11,8 +13,8 @@ pipeline:
     commands:
       - ln -s /var/cache/drone/scala-scala scala-scala
       - ln -s /var/cache/drone/ivy2 "$HOME/.ivy2"
-      - ./scripts/update-scala-library
-      - sbt -J-Xmx4096m -J-XX:ReservedCodeCacheSize=512m -J-XX:MaxMetaspaceSize=1024m -Ddotty.drone.mem=4096m "${TEST}"
+      - ./project/scripts/updateScalaLibrary
+      - sbt -J-Xmx4096m -J-XX:ReservedCodeCacheSize=512m -J-XX:MaxMetaspaceSize=1024m -Ddotty.drone.mem=4096m "${CI_TEST}"
     when:
       branch:
         exclude: gh-pages
@@ -21,16 +23,10 @@ pipeline:
     image: lampepfl/dotty:24-04-2017
     pull: true
     commands:
-      - ./project/scripts/genDocs "${TEST}" $BOT_PASS
+      - ./project/scripts/genDocs "${CI_PUBLISH}" $BOT_PASS
     when:
       branch: master
 
-  gitter:
-    image: plugins/gitter
-    when:
-      branch: master
-      status: changed
-
   slack:
     image: plugins/slack
     channel: dotty
@@ -39,8 +35,12 @@ pipeline:
       status: changed
 
 matrix:
-  TEST:
-    - dotty-bin-tests/test
-    - legacyTests
-    - test
-    - ;publishLocal ;dotty-bootstrapped/test
+  include:
+    - CI_TEST: dotty-bin-tests/test
+      CI_PUBLISH: true
+    - CI_TEST: legacyTests
+      CI_PUBLISH: false
+    - CI_TEST: test
+      CI_PUBLISH: false
+    - CI_TEST: ;publishLocal ;dotty-bootstrapped/test
+      CI_PUBLISH: false

.drone.yml.sig

@@ -1 +1 @@
-eyJhbGciOiJIUzI1NiJ9.IyBBZnRlciB1cGRhdGluZyB0aGlzIGZpbGUsIHlvdSBuZWVkIHRvIHJlLXNpZ24gaXQ6CiMKIyAtIEluc3RhbGwgW2Ryb25lLWNsaV0oaHR0cDovL3JlYWRtZS5kcm9uZS5pby91c2FnZS9nZXR0aW5nLXN0YXJ0ZWQtY2xpLykKIyAtIENvcHkgeW91ciB0b2tlbiBmcm9tICBodHRwOi8vZG90dHktY2kuZXBmbC5jaC9hY2NvdW50IChDbGljayBTSE9XIFRPS0VOKQojIC0gKGV4cG9ydCBEUk9ORV9UT0tFTj15b3VyLXRva2VuOyBleHBvcnQgRFJPTkVfU0VSVkVSPWh0dHA6Ly9kb3R0eS1jaS5lcGZsLmNoOyBkcm9uZSBzaWduIGxhbXBlcGZsL2RvdHR5KQoKcGlwZWxpbmU6CiAgdGVzdDoKICAgIGltYWdlOiBsYW1wZXBmbC9kb3R0eToyNC0wNC0yMDE3CiAgICBwdWxsOiB0cnVlCiAgICBjb21tYW5kczoKICAgICAgLSBsbiAtcyAvdmFyL2NhY2hlL2Ryb25lL3NjYWxhLXNjYWxhIHNjYWxhLXNjYWxhCiAgICAgIC0gbG4gLXMgL3Zhci9jYWNoZS9kcm9uZS9pdnkyICIkSE9NRS8uaXZ5MiIKICAgICAgLSAuL3NjcmlwdHMvdXBkYXRlLXNjYWxhLWxpYnJhcnkKICAgICAgLSBzYnQgLUotWG14NDA5Nm0gLUotWFg6UmVzZXJ2ZWRDb2RlQ2FjaGVTaXplPTUxMm0gLUotWFg6TWF4TWV0YXNwYWNlU2l6ZT0xMDI0bSAtRGRvdHR5LmRyb25lLm1lbT00MDk2bSAiJHtURVNUfSIKICAgIHdoZW46CiAgICAgIGJyYW5jaDoKICAgICAgICBleGNsdWRlOiBnaC1wYWdlcwoKICBkb2N1bWVudGF0aW9uOgogICAgaW1hZ2U6IGxhbXBlcGZsL2RvdHR5OjI0LTA0LTIwMTcKICAgIHB1bGw6IHRydWUKICAgIGNvbW1hbmRzOgogICAgICAtIC4vcHJvamVjdC9zY3JpcHRzL2dlbkRvY3MgIiR7VEVTVH0iICRCT1RfUEFTUwogICAgd2hlbjoKICAgICAgYnJhbmNoOiBtYXN0ZXIKCiAgZ2l0dGVyOgogICAgaW1hZ2U6IHBsdWdpbnMvZ2l0dGVyCiAgICB3aGVuOgogICAgICBicmFuY2g6IG1hc3RlcgogICAgICBzdGF0dXM6IGNoYW5nZWQKCiAgc2xhY2s6CiAgICBpbWFnZTogcGx1Z2lucy9zbGFjawogICAgY2hhbm5lbDogZG90dHkKICAgIHdoZW46CiAgICAgIGJyYW5jaDogbWFzdGVyCiAgICAgIHN0YXR1czogY2hhbmdlZAoKbWF0cml4OgogIFRFU1Q6CiAgICAtIGRvdHR5LWJpbi10ZXN0cy90ZXN0CiAgICAtIGxlZ2FjeVRlc3RzCiAgICAtIHRlc3QKICAgIC0gO3B1Ymxpc2hMb2NhbCA7ZG90dHktYm9vdHN0cmFwcGVkL3Rlc3QK.EsUhajLl7Dz1yK1EQYoRhzO2XSp2l6risn-vVYYj1zo
+eyJhbGciOiJIUzI1NiJ9.IyBBZnRlciB1cGRhdGluZyB0aGlzIGZpbGUsIHlvdSBuZWVkIHRvIHJlLXNpZ24gaXQ6CiMKIyAtIEluc3RhbGwgW2Ryb25lLWNsaV0oaHR0cDovL3JlYWRtZS5kcm9uZS5pby91c2FnZS9nZXR0aW5nLXN0YXJ0ZWQtY2xpLykKIyAtIENvcHkgeW91ciB0b2tlbiBmcm9tICBodHRwOi8vZG90dHktY2kuZXBmbC5jaC9hY2NvdW50IChDbGljayBTSE9XIFRPS0VOKQojIC0gKGV4cG9ydCBEUk9ORV9UT0tFTj15b3VyLXRva2VuOyBleHBvcnQgRFJPTkVfU0VSVkVSPWh0dHA6Ly9kb3R0eS1jaS5lcGZsLmNoOyBkcm9uZSBzaWduIGxhbXBlcGZsL2RvdHR5KQojCiMgUGxlYXNlIG5vdGUgdGhhdCB0aGUgc2lnbmluZyBjYW4gb25seSBiZSBkb25lIGJ5IGNvbGxhYm9yYXRvcnMuCgpwaXBlbGluZToKICB0ZXN0OgogICAgaW1hZ2U6IGxhbXBlcGZsL2RvdHR5OjI0LTA0LTIwMTcKICAgIHB1bGw6IHRydWUKICAgIGNvbW1hbmRzOgogICAgICAtIGxuIC1zIC92YXIvY2FjaGUvZHJvbmUvc2NhbGEtc2NhbGEgc2NhbGEtc2NhbGEKICAgICAgLSBsbiAtcyAvdmFyL2NhY2hlL2Ryb25lL2l2eTIgIiRIT01FLy5pdnkyIgogICAgICAtIC4vcHJvamVjdC9zY3JpcHRzL3VwZGF0ZVNjYWxhTGlicmFyeQogICAgICAtIHNidCAtSi1YbXg0MDk2bSAtSi1YWDpSZXNlcnZlZENvZGVDYWNoZVNpemU9NTEybSAtSi1YWDpNYXhNZXRhc3BhY2VTaXplPTEwMjRtIC1EZG90dHkuZHJvbmUubWVtPTQwOTZtICIke0NJX1RFU1R9IgogICAgd2hlbjoKICAgICAgYnJhbmNoOgogICAgICAgIGV4Y2x1ZGU6IGdoLXBhZ2VzCgogIGRvY3VtZW50YXRpb246CiAgICBpbWFnZTogbGFtcGVwZmwvZG90dHk6MjQtMDQtMjAxNwogICAgcHVsbDogdHJ1ZQogICAgY29tbWFuZHM6CiAgICAgIC0gLi9wcm9qZWN0L3NjcmlwdHMvZ2VuRG9jcyAiJHtDSV9QVUJMSVNIfSIgJEJPVF9QQVNTCiAgICB3aGVuOgogICAgICBicmFuY2g6IG1hc3RlcgoKICBzbGFjazoKICAgIGltYWdlOiBwbHVnaW5zL3NsYWNrCiAgICBjaGFubmVsOiBkb3R0eQogICAgd2hlbjoKICAgICAgYnJhbmNoOiBtYXN0ZXIKICAgICAgc3RhdHVzOiBjaGFuZ2VkCgptYXRyaXg6CiAgaW5jbHVkZToKICAgIC0gQ0lfVEVTVDogZG90dHktYmluLXRlc3RzL3Rlc3QKICAgICAgQ0lfUFVCTElTSDogdHJ1ZQogICAgLSBDSV9URVNUOiBsZWdhY3lUZXN0cwogICAgICBDSV9QVUJMSVNIOiBmYWxzZQogICAgLSBDSV9URVNUOiB0ZXN0CiAgICAgIENJX1BVQkxJU0g6IGZhbHNlCiAgICAtIENJX1RFU1Q6IDtwdWJsaXNoTG9jYWwgO2RvdHR5LWJvb3RzdHJhcHBlZC90ZXN0CiAgICAgIENJX1BVQkxJU0g6IGZhbHNlCg.8EX_-bxlrDkovwBAfZ6d7HE162C7skwpZLQqQNDBrPo

project/VersionUtil.scala

@@ -4,8 +4,8 @@ object VersionUtil {
   def executeScript(scriptName: String) = {
     val cmd =
       if (System.getProperty("os.name").toLowerCase.contains("windows"))
-        s"cmd.exe /c scripts\\build\\$scriptName.bat -p"
-      else s"scripts/build/$scriptName"
+        s"cmd.exe /c project\\scripts\\build\\$scriptName.bat -p"
+      else s"project/scripts/build/$scriptName"
     Process(cmd).lines.head.trim
   }
 

scripts/build/get-scala-commit-date renamed to project/scripts/build/get-scala-commit-date

@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 
-# Usage: ./genDocs <test variable> <dotty-bot password>
+# Usage: ./genDocs <true/false> <dotty-bot password>
 
 set -e
 # set extended glob, needed for rm everything but x
 shopt -s extglob
 
-if [ "$1" = ";dotty-compiler/testOnly dotty.tools.dotc.CompilationTests" ]; then
+if [ $1 = true ]; then
 
     # make sure that BOT_PASS is set
     if [ -z ${2+x} ]; then

scripts/build/get-scala-commit-date.bat renamed to project/scripts/build/get-scala-commit-date.bat

@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 update() {
   [[ -d $baseDir ]] || mkdir -p $baseDir
   cd $baseDir
@@ -10,10 +12,12 @@ update() {
   (git fetch "https://github.com/$1/$2.git" $4 && git checkout -fq FETCH_HEAD) #|| git checkout -fq $4 # || fallback is for local testing on tag
   git reset --hard
   echo updated $1/$2:$4 under $3. Last commits:
-  git log --pretty=format:"%h - %an, %aD : %s" -n 10 # show last commits
+  git --no-pager log --pretty=format:"%h - %an, %aD : %s" -n 10 # show last commits
   cd -
 }
 
 export LC_ALL=en_US.UTF-8
-unset _JAVA_OPTIONS
-sbtArgs="-Ddotty.jenkins.build=yes -Dfile.encoding=UTF-8 -ivy $baseDir/ivy2 -Dsbt.global.base=$HOME/.sbt/0.13 -sbt-dir $HOME/.sbt/0.13"
+
+baseDir=`pwd`
+
+update DarkDimius scala scala-scala dotty-library