Skip to content

Commit 7085e7d

Browse files
committed
Update docker image
1 parent 16d0499 commit 7085e7d

File tree

2 files changed

+24
-21
lines changed

2 files changed

+24
-21
lines changed

.drone.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,37 +16,37 @@ pipeline:
1616
# We run tests in parallel. Tests run in a copy of the working directory to avoid conflict
1717
test_legacy:
1818
group: test
19-
image: lampepfl/dotty:2018-01-15
19+
image: lampepfl/dotty:2018-01-17
2020
commands:
2121
- cp -R . /tmp/0/ && cd /tmp/0/
2222
- ./project/scripts/sbt legacyTests
2323

2424
test:
2525
group: test
26-
image: lampepfl/dotty:2018-01-15
26+
image: lampepfl/dotty:2018-01-17
2727
commands:
2828
- cp -R . /tmp/1/ && cd /tmp/1/
2929
- ./project/scripts/sbt ";compile ;test"
3030
- ./project/scripts/sbtTests
3131

3232
test_bootstrapped:
3333
group: test
34-
image: lampepfl/dotty:2018-01-15
34+
image: lampepfl/dotty:2018-01-17
3535
commands:
3636
- cp -R . /tmp/2/ && cd /tmp/2/
3737
- ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test"
3838
- ./project/scripts/sbtBootstrappedTests
3939

4040
test_optimised:
4141
group: test
42-
image: lampepfl/dotty:2018-01-15
42+
image: lampepfl/dotty:2018-01-17
4343
commands:
4444
- cp -R . /tmp/3/ && cd /tmp/3/
4545
- ./project/scripts/sbt dotty-optimised/test
4646

4747
test_sbt:
4848
group: test
49-
image: lampepfl/dotty:2018-01-15
49+
image: lampepfl/dotty:2018-01-17
5050
commands:
5151
- cp -R . /tmp/4/ && cd /tmp/4/
5252
- ./project/scripts/sbt sbt-dotty/scripted
@@ -56,7 +56,7 @@ pipeline:
5656

5757
# DOCUMENTATION:
5858
documentation:
59-
image: lampepfl/dotty:2018-01-15
59+
image: lampepfl/dotty:2018-01-17
6060
commands:
6161
- ./project/scripts/genDocs
6262
secrets: [ bot_pass ]
@@ -68,7 +68,7 @@ pipeline:
6868
# PUBLISHING:
6969
# Publishing expect NIGHTLYBUILD or RELEASEBUILD to be set. See dottyVersion in Build.scala
7070
publish_nightly:
71-
image: lampepfl/dotty:2018-01-15
71+
image: lampepfl/dotty:2018-01-17
7272
environment:
7373
- NIGHTLYBUILD=yes
7474
commands:
@@ -79,7 +79,7 @@ pipeline:
7979
environment: nightly
8080

8181
publish_release:
82-
image: lampepfl/dotty:2018-01-15
82+
image: lampepfl/dotty:2018-01-17
8383
environment:
8484
- RELEASEBUILD=yes
8585
commands:
@@ -103,7 +103,7 @@ pipeline:
103103
event: tag
104104

105105
publish_sbt_release:
106-
image: lampepfl/dotty:2018-01-15
106+
image: lampepfl/dotty:2018-01-17
107107
environment:
108108
- RELEASEBUILD=yes
109109
commands:

project/Build.scala

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -391,18 +391,21 @@ object Build {
391391
(runMain in Compile).toTask(s""" dotty.tools.dottydoc.Main ${cp.mkString(" ")} """ + args.mkString(" "))
392392
}.evaluated,
393393

394-
libraryDependencies ++= Seq(
395-
"com.vladsch.flexmark" % "flexmark" % "0.28.32",
396-
"com.vladsch.flexmark" % "flexmark-ext-gfm-tasklist" % "0.28.32",
397-
"com.vladsch.flexmark" % "flexmark-ext-gfm-tables" % "0.28.32",
398-
"com.vladsch.flexmark" % "flexmark-ext-autolink" % "0.28.32",
399-
"com.vladsch.flexmark" % "flexmark-ext-anchorlink" % "0.28.32",
400-
"com.vladsch.flexmark" % "flexmark-ext-emoji" % "0.28.32",
401-
"com.vladsch.flexmark" % "flexmark-ext-gfm-strikethrough" % "0.28.32",
402-
"com.vladsch.flexmark" % "flexmark-ext-yaml-front-matter" % "0.28.32",
403-
Dependencies.`jackson-dataformat-yaml`,
404-
"nl.big-o" % "liqp" % "0.6.7"
405-
)
394+
libraryDependencies ++= {
395+
val flexmarkVersion = "0.28.32"
396+
Seq(
397+
"com.vladsch.flexmark" % "flexmark" % flexmarkVersion,
398+
"com.vladsch.flexmark" % "flexmark-ext-gfm-tasklist" % flexmarkVersion,
399+
"com.vladsch.flexmark" % "flexmark-ext-gfm-tables" % flexmarkVersion,
400+
"com.vladsch.flexmark" % "flexmark-ext-autolink" % flexmarkVersion,
401+
"com.vladsch.flexmark" % "flexmark-ext-anchorlink" % flexmarkVersion,
402+
"com.vladsch.flexmark" % "flexmark-ext-emoji" % flexmarkVersion,
403+
"com.vladsch.flexmark" % "flexmark-ext-gfm-strikethrough" % flexmarkVersion,
404+
"com.vladsch.flexmark" % "flexmark-ext-yaml-front-matter" % flexmarkVersion,
405+
Dependencies.`jackson-dataformat-yaml`,
406+
"nl.big-o" % "liqp" % "0.6.7"
407+
)
408+
}
406409
)
407410

408411
lazy val `dotty-doc` = project.in(file("doc-tool")).asDottyDoc(NonBootstrapped)

0 commit comments

Comments
 (0)