Skip to content

Commit 0dc6860

Browse files
authored
Merge pull request #3355 from allanrenucci/2.12.4
Bump scala version to 2.12.4
2 parents 3c0eccf + b35c765 commit 0dc6860

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.drone.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,37 @@ pipeline:
33
# We run tests in parallel. Tests run in a copy of the working directory to avoid conflict
44
test_legacy:
55
group: test
6-
image: lampepfl/dotty:2017-10-07
6+
image: lampepfl/dotty:2017-10-20
77
commands:
88
- cp -R . /tmp/0/ && cd /tmp/0/
99
- ./project/scripts/sbt legacyTests
1010

1111
test:
1212
group: test
13-
image: lampepfl/dotty:2017-10-07
13+
image: lampepfl/dotty:2017-10-20
1414
commands:
1515
- cp -R . /tmp/1/ && cd /tmp/1/
1616
- ./project/scripts/sbt testAll
1717
- ./project/scripts/sbt ";dotty-bench/jmh:run 1 1 tests/run/arrays.scala"
1818

1919
test_bootstrapped:
2020
group: test
21-
image: lampepfl/dotty:2017-10-07
21+
image: lampepfl/dotty:2017-10-20
2222
commands:
2323
- cp -R . /tmp/2/ && cd /tmp/2/
2424
- ./project/scripts/sbt dotty-bootstrapped/testAll
2525
- ./project/scripts/sbt ";dotty-bench-bootstrapped/jmh:run 1 1 tests/run/arrays.scala"
2626

2727
test_optimised:
2828
group: test
29-
image: lampepfl/dotty:2017-10-07
29+
image: lampepfl/dotty:2017-10-20
3030
commands:
3131
- cp -R . /tmp/3/ && cd /tmp/3/
3232
- ./project/scripts/sbt dotty-optimised/testAll
3333

3434
test_sbt:
3535
group: test
36-
image: lampepfl/dotty:2017-10-07
36+
image: lampepfl/dotty:2017-10-20
3737
commands:
3838
- cp -R . /tmp/4/ && cd /tmp/4/
3939
- ./project/scripts/sbt sbt-dotty/scripted
@@ -43,7 +43,7 @@ pipeline:
4343

4444
# DOCUMENTATION:
4545
documentation:
46-
image: lampepfl/dotty:2017-10-07
46+
image: lampepfl/dotty:2017-10-20
4747
commands:
4848
- ./project/scripts/genDocs
4949
secrets: [ bot_pass ]
@@ -55,7 +55,7 @@ pipeline:
5555
# PUBLISHING:
5656
# Publishing expect NIGHTLYBUILD or RELEASEBUILD to be set. See dottyVersion in Build.scala
5757
publish_nightly:
58-
image: lampepfl/dotty:2017-10-07
58+
image: lampepfl/dotty:2017-10-20
5959
environment:
6060
- NIGHTLYBUILD=yes
6161
commands:
@@ -68,7 +68,7 @@ pipeline:
6868
environment: nightly
6969

7070
publish_release:
71-
image: lampepfl/dotty:2017-10-07
71+
image: lampepfl/dotty:2017-10-20
7272
environment:
7373
- RELEASEBUILD=yes
7474
commands:
@@ -94,7 +94,7 @@ pipeline:
9494
event: tag
9595

9696
publish_sbt_release:
97-
image: lampepfl/dotty:2017-10-07
97+
image: lampepfl/dotty:2017-10-20
9898
environment:
9999
- RELEASEBUILD=yes
100100
commands:

project/Build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ object ExposedValues extends AutoPlugin {
3636

3737
object Build {
3838

39-
val scalacVersion = "2.12.3"
39+
val scalacVersion = "2.12.4"
4040

4141
val dottyOrganization = "ch.epfl.lamp"
4242
val dottyGithubUrl = "https://github.com/lampepfl/dotty"

0 commit comments

Comments
 (0)