Skip to content

Commit 9fef733

Browse files
Make the community-build sequencial & run on drone
1 parent f72e41b commit 9fef733

File tree

3 files changed

+16
-43
lines changed

3 files changed

+16
-43
lines changed

.drone.yml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,33 +23,41 @@ pipeline:
2323
# We run tests in parallel. Tests run in a copy of the working directory to avoid conflict
2424
test:
2525
group: test
26-
image: lampepfl/dotty:2018-12-12
26+
image: lampepfl/dotty:2019-02-06
2727
commands:
2828
- cp -R . /tmp/1/ && cd /tmp/1/
2929
- ./project/scripts/sbt ";compile ;test"
3030
- ./project/scripts/cmdTests
3131

3232
test_bootstrapped:
3333
group: test
34-
image: lampepfl/dotty:2018-12-12
34+
image: lampepfl/dotty:2019-02-06
3535
commands:
3636
- cp -R . /tmp/2/ && cd /tmp/2/
3737
- ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test ;sjsSandbox/run"
3838
- ./project/scripts/bootstrapCmdTests
3939

4040
test_sbt:
4141
group: test
42-
image: lampepfl/dotty:2018-12-12
42+
image: lampepfl/dotty:2019-02-06
4343
commands:
4444
- cp -R . /tmp/3/ && cd /tmp/3/
4545
- ./project/scripts/sbt sbt-dotty/scripted
4646
when:
4747
# sbt scripted tests are slow and only run on nightly or deployment
4848
event: [ tag, deployment ]
4949

50+
test_community_build:
51+
group: test
52+
image: lampepfl/dotty:2019-02-06
53+
commands:
54+
- cp -R . /tmp/4/ && cd /tmp/4/
55+
- export PATH=$PATH:/tmp/4/project/scripts/
56+
- sbt community-build/test
57+
5058
# DOCUMENTATION:
5159
documentation:
52-
image: lampepfl/dotty:2018-12-12
60+
image: lampepfl/dotty:2019-02-06
5361
commands:
5462
- ./project/scripts/genDocs
5563
secrets: [ bot_token ]
@@ -61,7 +69,7 @@ pipeline:
6169
# PUBLISHING:
6270
# Publishing expect NIGHTLYBUILD or RELEASEBUILD to be set. See dottyVersion in Build.scala
6371
publish_nightly:
64-
image: lampepfl/dotty:2018-12-12
72+
image: lampepfl/dotty:2019-02-06
6573
environment:
6674
- NIGHTLYBUILD=yes
6775
commands:
@@ -72,7 +80,7 @@ pipeline:
7280
environment: nightly
7381

7482
publish_release:
75-
image: lampepfl/dotty:2018-12-12
83+
image: lampepfl/dotty:2019-02-06
7684
environment:
7785
- RELEASEBUILD=yes
7886
commands:
@@ -96,7 +104,7 @@ pipeline:
96104
event: tag
97105

98106
publish_sbt_release:
99-
image: lampepfl/dotty:2018-12-12
107+
image: lampepfl/dotty:2019-02-06
100108
environment:
101109
- RELEASEBUILD=yes
102110
commands:

.travis.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import java.nio.charset.StandardCharsets.UTF_8
66
import org.junit.{Ignore, Test}
77
import org.junit.Assert.{assertEquals, fail}
88

9-
abstract class BuildTest {
9+
class CommunityBuildTest {
1010
lazy val communitybuildDir: Path = Paths.get(sys.props("user.dir") + "/community-build/")
1111

1212
lazy val compilerVersion: String = {
@@ -81,14 +81,7 @@ abstract class BuildTest {
8181
|""".stripMargin)
8282
}
8383
}
84-
}
85-
86-
// The tests are divided into 5 classes, run in parrallele by Travis CI
87-
// (.travis.yml). When adding a new projects to the community build please
88-
// select the fastest CommunityBuildTestN class according to the running
89-
// times from https://travis-ci.org/lampepfl/dotty.
9084

91-
class CommunityBuildTest1 extends BuildTest {
9285
@Test def algebra = test(
9386
project = "algebra",
9487
command = "coreJVM/compile"
@@ -98,9 +91,7 @@ class CommunityBuildTest1 extends BuildTest {
9891
project = "scalacheck",
9992
command = "jvm/test:compile"
10093
)
101-
}
10294

103-
class CommunityBuildTest2 extends BuildTest {
10495
@Test def scalatest = test(
10596
project = "scalatest",
10697
command = "scalatest/compile"
@@ -115,9 +106,7 @@ class CommunityBuildTest2 extends BuildTest {
115106
project = "scalap",
116107
command = "scalap/compile"
117108
)
118-
}
119109

120-
class CommunityBuildTest3 extends BuildTest {
121110
@Test def squants = test(
122111
project = "squants",
123112
command = "squantsJVM/compile"
@@ -132,9 +121,7 @@ class CommunityBuildTest3 extends BuildTest {
132121
project = "ScalaPB",
133122
command = "dottyCompile"
134123
)
135-
}
136124

137-
class CommunityBuildTest4 extends BuildTest {
138125
@Test def minitest = test(
139126
project = "minitest",
140127
command = "dottyCompile"
@@ -150,9 +137,7 @@ class CommunityBuildTest4 extends BuildTest {
150137
project = "sourcecode",
151138
command = "sourcecodeJVM/compile"
152139
)
153-
}
154140

155-
class CommunityBuildTest5 extends BuildTest {
156141
// TODO @smarter?
157142
// @Test def stdLib213 = test(
158143
// project = "stdLib213",

0 commit comments

Comments
 (0)