aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Mulder <felix.mulder@gmail.com>2016-12-19 18:28:18 +0100
committerGitHub <noreply@github.com>2016-12-19 18:28:18 +0100
commite23c2783521c5fb0808da3bf3ebc5e0bdd09d33d (patch)
treee5df407a64b558d65c64c1d46ce037ecde582aa5
parent334db9777d674ed17763375d5b80cb884b9eca44 (diff)
parent4ccb4b9d27d09b5b83afda0c1123443c3b806672 (diff)
downloaddotty-e23c2783521c5fb0808da3bf3ebc5e0bdd09d33d.tar.gz
dotty-e23c2783521c5fb0808da3bf3ebc5e0bdd09d33d.tar.bz2
dotty-e23c2783521c5fb0808da3bf3ebc5e0bdd09d33d.zip
Merge pull request #1835 from dotty-staging/topic/update-scala-repo
Add git pull scala-scala to list of test commands
-rw-r--r--.drone.yml3
-rwxr-xr-xscripts/jobs/validate/junit3
-rwxr-xr-xscripts/jobs/validate/partest3
-rwxr-xr-xscripts/jobs/validate/partest-bootstrapped3
-rwxr-xr-xscripts/update-scala-library5
5 files changed, 16 insertions, 1 deletions
diff --git a/.drone.yml b/.drone.yml
index 9c49812b8..0b927794e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,9 +1,10 @@
pipeline:
test:
- image: lampepfl/dotty:0.2
+ image: lampepfl/dotty:latest
pull: true
commands:
- ln -s /var/cache/drone/scala-scala scala-scala
+ - ./scripts/update-scala-library
- sbt -Ddotty.drone.mem=4096m -ivy /var/cache/drone/ivy2 "${TEST}"
matrix:
diff --git a/scripts/jobs/validate/junit b/scripts/jobs/validate/junit
index cf9b49c33..75564626f 100755
--- a/scripts/jobs/validate/junit
+++ b/scripts/jobs/validate/junit
@@ -1,6 +1,9 @@
#!/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
diff --git a/scripts/jobs/validate/partest b/scripts/jobs/validate/partest
index 4d4eb57e6..acfdc79a0 100755
--- a/scripts/jobs/validate/partest
+++ b/scripts/jobs/validate/partest
@@ -1,6 +1,9 @@
#!/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
diff --git a/scripts/jobs/validate/partest-bootstrapped b/scripts/jobs/validate/partest-bootstrapped
index 2f127f55b..150b43f6f 100755
--- a/scripts/jobs/validate/partest-bootstrapped
+++ b/scripts/jobs/validate/partest-bootstrapped
@@ -1,6 +1,9 @@
#!/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
diff --git a/scripts/update-scala-library b/scripts/update-scala-library
new file mode 100755
index 000000000..24d788062
--- /dev/null
+++ b/scripts/update-scala-library
@@ -0,0 +1,5 @@
+#!/bin/bash -e
+
+baseDir=`pwd`
+. $baseDir/scripts/common
+update DarkDimius scala scala-scala dotty-library