From 9ef793805a351fb98d2f26a197ea26cc817c0e96 Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Tue, 25 Apr 2017 11:48:01 +0200 Subject: [PATCH 1/3] Change drone matrix to include variable for publishing --- .drone.yml | 26 +++++++++++++------------- project/scripts/genDocs | 4 ++-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7f9194e6d789..af411190c356 100644 --- a/.drone.yml +++ b/.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: @@ -12,7 +14,7 @@ pipeline: - 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}" + - 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 diff --git a/project/scripts/genDocs b/project/scripts/genDocs index 73e034276a8f..464c1f21f286 100755 --- a/project/scripts/genDocs +++ b/project/scripts/genDocs @@ -1,12 +1,12 @@ #!/usr/bin/env bash -# Usage: ./genDocs +# Usage: ./genDocs 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 From 813115063196c7b04085e210bb02d8bf4eeb466d Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Tue, 25 Apr 2017 11:50:26 +0200 Subject: [PATCH 2/3] Remove old validate scripts --- .drone.yml | 2 +- .drone.yml.sig | 2 +- .../common => project/scripts/updateScalaLibrary | 10 +++++++--- scripts/jobs/validate/junit | 12 ------------ scripts/jobs/validate/partest | 14 -------------- scripts/jobs/validate/partest-bootstrapped | 14 -------------- scripts/jobs/validate/scalastyle | 8 -------- scripts/update-scala-library | 5 ----- 8 files changed, 9 insertions(+), 58 deletions(-) rename scripts/common => project/scripts/updateScalaLibrary (66%) delete mode 100755 scripts/jobs/validate/junit delete mode 100755 scripts/jobs/validate/partest delete mode 100755 scripts/jobs/validate/partest-bootstrapped delete mode 100755 scripts/jobs/validate/scalastyle delete mode 100755 scripts/update-scala-library diff --git a/.drone.yml b/.drone.yml index af411190c356..5784fe621936 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,7 +13,7 @@ pipeline: commands: - ln -s /var/cache/drone/scala-scala scala-scala - ln -s /var/cache/drone/ivy2 "$HOME/.ivy2" - - ./scripts/update-scala-library + - ./project/scripts/updateScalaLibrary - sbt -J-Xmx4096m -J-XX:ReservedCodeCacheSize=512m -J-XX:MaxMetaspaceSize=1024m -Ddotty.drone.mem=4096m "${CI_TEST}" when: branch: diff --git a/.drone.yml.sig b/.drone.yml.sig index cbf72458c9ce..170ca5350877 100644 --- a/.drone.yml.sig +++ b/.drone.yml.sig @@ -1 +1 @@ -eyJhbGciOiJIUzI1NiJ9.IyBBZnRlciB1cGRhdGluZyB0aGlzIGZpbGUsIHlvdSBuZWVkIHRvIHJlLXNpZ24gaXQ6CiMKIyAtIEluc3RhbGwgW2Ryb25lLWNsaV0oaHR0cDovL3JlYWRtZS5kcm9uZS5pby91c2FnZS9nZXR0aW5nLXN0YXJ0ZWQtY2xpLykKIyAtIENvcHkgeW91ciB0b2tlbiBmcm9tICBodHRwOi8vZG90dHktY2kuZXBmbC5jaC9hY2NvdW50IChDbGljayBTSE9XIFRPS0VOKQojIC0gKGV4cG9ydCBEUk9ORV9UT0tFTj15b3VyLXRva2VuOyBleHBvcnQgRFJPTkVfU0VSVkVSPWh0dHA6Ly9kb3R0eS1jaS5lcGZsLmNoOyBkcm9uZSBzaWduIGxhbXBlcGZsL2RvdHR5KQoKcGlwZWxpbmU6CiAgdGVzdDoKICAgIGltYWdlOiBsYW1wZXBmbC9kb3R0eToyNC0wNC0yMDE3CiAgICBwdWxsOiB0cnVlCiAgICBjb21tYW5kczoKICAgICAgLSBsbiAtcyAvdmFyL2NhY2hlL2Ryb25lL3NjYWxhLXNjYWxhIHNjYWxhLXNjYWxhCiAgICAgIC0gbG4gLXMgL3Zhci9jYWNoZS9kcm9uZS9pdnkyICIkSE9NRS8uaXZ5MiIKICAgICAgLSAuL3NjcmlwdHMvdXBkYXRlLXNjYWxhLWxpYnJhcnkKICAgICAgLSBzYnQgLUotWG14NDA5Nm0gLUotWFg6UmVzZXJ2ZWRDb2RlQ2FjaGVTaXplPTUxMm0gLUotWFg6TWF4TWV0YXNwYWNlU2l6ZT0xMDI0bSAtRGRvdHR5LmRyb25lLm1lbT00MDk2bSAiJHtURVNUfSIKICAgIHdoZW46CiAgICAgIGJyYW5jaDoKICAgICAgICBleGNsdWRlOiBnaC1wYWdlcwoKICBkb2N1bWVudGF0aW9uOgogICAgaW1hZ2U6IGxhbXBlcGZsL2RvdHR5OjI0LTA0LTIwMTcKICAgIHB1bGw6IHRydWUKICAgIGNvbW1hbmRzOgogICAgICAtIC4vcHJvamVjdC9zY3JpcHRzL2dlbkRvY3MgIiR7VEVTVH0iICRCT1RfUEFTUwogICAgd2hlbjoKICAgICAgYnJhbmNoOiBtYXN0ZXIKCiAgZ2l0dGVyOgogICAgaW1hZ2U6IHBsdWdpbnMvZ2l0dGVyCiAgICB3aGVuOgogICAgICBicmFuY2g6IG1hc3RlcgogICAgICBzdGF0dXM6IGNoYW5nZWQKCiAgc2xhY2s6CiAgICBpbWFnZTogcGx1Z2lucy9zbGFjawogICAgY2hhbm5lbDogZG90dHkKICAgIHdoZW46CiAgICAgIGJyYW5jaDogbWFzdGVyCiAgICAgIHN0YXR1czogY2hhbmdlZAoKbWF0cml4OgogIFRFU1Q6CiAgICAtIGRvdHR5LWJpbi10ZXN0cy90ZXN0CiAgICAtIGxlZ2FjeVRlc3RzCiAgICAtIHRlc3QKICAgIC0gO3B1Ymxpc2hMb2NhbCA7ZG90dHktYm9vdHN0cmFwcGVkL3Rlc3QK.EsUhajLl7Dz1yK1EQYoRhzO2XSp2l6risn-vVYYj1zo \ No newline at end of file +eyJhbGciOiJIUzI1NiJ9.IyBBZnRlciB1cGRhdGluZyB0aGlzIGZpbGUsIHlvdSBuZWVkIHRvIHJlLXNpZ24gaXQ6CiMKIyAtIEluc3RhbGwgW2Ryb25lLWNsaV0oaHR0cDovL3JlYWRtZS5kcm9uZS5pby91c2FnZS9nZXR0aW5nLXN0YXJ0ZWQtY2xpLykKIyAtIENvcHkgeW91ciB0b2tlbiBmcm9tICBodHRwOi8vZG90dHktY2kuZXBmbC5jaC9hY2NvdW50IChDbGljayBTSE9XIFRPS0VOKQojIC0gKGV4cG9ydCBEUk9ORV9UT0tFTj15b3VyLXRva2VuOyBleHBvcnQgRFJPTkVfU0VSVkVSPWh0dHA6Ly9kb3R0eS1jaS5lcGZsLmNoOyBkcm9uZSBzaWduIGxhbXBlcGZsL2RvdHR5KQojCiMgUGxlYXNlIG5vdGUgdGhhdCB0aGUgc2lnbmluZyBjYW4gb25seSBiZSBkb25lIGJ5IGNvbGxhYm9yYXRvcnMuCgpwaXBlbGluZToKICB0ZXN0OgogICAgaW1hZ2U6IGxhbXBlcGZsL2RvdHR5OjI0LTA0LTIwMTcKICAgIHB1bGw6IHRydWUKICAgIGNvbW1hbmRzOgogICAgICAtIGxuIC1zIC92YXIvY2FjaGUvZHJvbmUvc2NhbGEtc2NhbGEgc2NhbGEtc2NhbGEKICAgICAgLSBsbiAtcyAvdmFyL2NhY2hlL2Ryb25lL2l2eTIgIiRIT01FLy5pdnkyIgogICAgICAtIC4vcHJvamVjdC9zY3JpcHRzL3VwZGF0ZVNjYWxhTGlicmFyeQogICAgICAtIHNidCAtSi1YbXg0MDk2bSAtSi1YWDpSZXNlcnZlZENvZGVDYWNoZVNpemU9NTEybSAtSi1YWDpNYXhNZXRhc3BhY2VTaXplPTEwMjRtIC1EZG90dHkuZHJvbmUubWVtPTQwOTZtICIke0NJX1RFU1R9IgogICAgd2hlbjoKICAgICAgYnJhbmNoOgogICAgICAgIGV4Y2x1ZGU6IGdoLXBhZ2VzCgogIGRvY3VtZW50YXRpb246CiAgICBpbWFnZTogbGFtcGVwZmwvZG90dHk6MjQtMDQtMjAxNwogICAgcHVsbDogdHJ1ZQogICAgY29tbWFuZHM6CiAgICAgIC0gLi9wcm9qZWN0L3NjcmlwdHMvZ2VuRG9jcyAiJHtDSV9QVUJMSVNIfSIgJEJPVF9QQVNTCiAgICB3aGVuOgogICAgICBicmFuY2g6IG1hc3RlcgoKICBzbGFjazoKICAgIGltYWdlOiBwbHVnaW5zL3NsYWNrCiAgICBjaGFubmVsOiBkb3R0eQogICAgd2hlbjoKICAgICAgYnJhbmNoOiBtYXN0ZXIKICAgICAgc3RhdHVzOiBjaGFuZ2VkCgptYXRyaXg6CiAgaW5jbHVkZToKICAgIC0gQ0lfVEVTVDogZG90dHktYmluLXRlc3RzL3Rlc3QKICAgICAgQ0lfUFVCTElTSDogdHJ1ZQogICAgLSBDSV9URVNUOiBsZWdhY3lUZXN0cwogICAgICBDSV9QVUJMSVNIOiBmYWxzZQogICAgLSBDSV9URVNUOiB0ZXN0CiAgICAgIENJX1BVQkxJU0g6IGZhbHNlCiAgICAtIENJX1RFU1Q6IDtwdWJsaXNoTG9jYWwgO2RvdHR5LWJvb3RzdHJhcHBlZC90ZXN0CiAgICAgIENJX1BVQkxJU0g6IGZhbHNlCg.8EX_-bxlrDkovwBAfZ6d7HE162C7skwpZLQqQNDBrPo \ No newline at end of file diff --git a/scripts/common b/project/scripts/updateScalaLibrary similarity index 66% rename from scripts/common rename to project/scripts/updateScalaLibrary index ab7a9ff6d844..3aad6aa867ef 100755 --- a/scripts/common +++ b/project/scripts/updateScalaLibrary @@ -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 diff --git a/scripts/jobs/validate/junit b/scripts/jobs/validate/junit deleted file mode 100755 index 75564626f454..000000000000 --- a/scripts/jobs/validate/junit +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -e - -baseDir=${WORKSPACE-`pwd`} -mkdir -p $baseDir/tests/partest-generated -touch $baseDir/tests/partest-generated/gen.log -exit 0 -scriptsDir="$baseDir/scripts" -. $scriptsDir/common - -git log --pretty=format:"%h - %an, %aD : %s" -n 10 -update DarkDimius scala scala-scala dotty-library -sbt $sbtArgs update compile test diff --git a/scripts/jobs/validate/partest b/scripts/jobs/validate/partest deleted file mode 100755 index acfdc79a0c6b..000000000000 --- a/scripts/jobs/validate/partest +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -e - -baseDir=${WORKSPACE-`pwd`} -mkdir -p $baseDir/tests/partest-generated -touch $baseDir/tests/partest-generated/gen.log -exit 0 -scriptsDir="$baseDir/scripts" -. $scriptsDir/common - -git log --pretty=format:"%h - %an, %aD : %s" -n 10 - -update DarkDimius scala scala-scala dotty-library -sbt $sbtArgs update compile "partest-only-no-bootstrap --show-diff --verbose" - diff --git a/scripts/jobs/validate/partest-bootstrapped b/scripts/jobs/validate/partest-bootstrapped deleted file mode 100755 index 150b43f6f32e..000000000000 --- a/scripts/jobs/validate/partest-bootstrapped +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -e - -baseDir=${WORKSPACE-`pwd`} -mkdir -p $baseDir/tests/partest-generated -touch $baseDir/tests/partest-generated/gen.log -exit 0 -scriptsDir="$baseDir/scripts" -. $scriptsDir/common - -git log --pretty=format:"%h - %an, %aD : %s" -n 10 - -update DarkDimius scala scala-scala dotty-library -sbt $sbtArgs update compile "partest-only --show-diff --verbose" - diff --git a/scripts/jobs/validate/scalastyle b/scripts/jobs/validate/scalastyle deleted file mode 100755 index 31ace83bae0c..000000000000 --- a/scripts/jobs/validate/scalastyle +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -e - -baseDir=${WORKSPACE-`pwd`} -scriptsDir="$baseDir/scripts" -. $scriptsDir/common - -sbt $sbtArgs scalastyle - diff --git a/scripts/update-scala-library b/scripts/update-scala-library deleted file mode 100755 index 24d7880622cc..000000000000 --- a/scripts/update-scala-library +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -e - -baseDir=`pwd` -. $baseDir/scripts/common -update DarkDimius scala scala-scala dotty-library From b01f13ec4a3ac15e5e922cc0019169e8563ffc8d Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Tue, 25 Apr 2017 11:52:27 +0200 Subject: [PATCH 3/3] Move sbt build scripts to project dir --- project/VersionUtil.scala | 4 ++-- {scripts => project/scripts}/build/get-scala-commit-date | 0 {scripts => project/scripts}/build/get-scala-commit-date.bat | 0 {scripts => project/scripts}/build/get-scala-commit-sha | 0 {scripts => project/scripts}/build/get-scala-commit-sha.bat | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename {scripts => project/scripts}/build/get-scala-commit-date (100%) rename {scripts => project/scripts}/build/get-scala-commit-date.bat (100%) rename {scripts => project/scripts}/build/get-scala-commit-sha (100%) rename {scripts => project/scripts}/build/get-scala-commit-sha.bat (100%) diff --git a/project/VersionUtil.scala b/project/VersionUtil.scala index 338cf2d95e2f..399a468591c8 100644 --- a/project/VersionUtil.scala +++ b/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 } diff --git a/scripts/build/get-scala-commit-date b/project/scripts/build/get-scala-commit-date similarity index 100% rename from scripts/build/get-scala-commit-date rename to project/scripts/build/get-scala-commit-date diff --git a/scripts/build/get-scala-commit-date.bat b/project/scripts/build/get-scala-commit-date.bat similarity index 100% rename from scripts/build/get-scala-commit-date.bat rename to project/scripts/build/get-scala-commit-date.bat diff --git a/scripts/build/get-scala-commit-sha b/project/scripts/build/get-scala-commit-sha similarity index 100% rename from scripts/build/get-scala-commit-sha rename to project/scripts/build/get-scala-commit-sha diff --git a/scripts/build/get-scala-commit-sha.bat b/project/scripts/build/get-scala-commit-sha.bat similarity index 100% rename from scripts/build/get-scala-commit-sha.bat rename to project/scripts/build/get-scala-commit-sha.bat