Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to 2.13.4 and make sure CI is testing correct cross versions #426

Merged
merged 2 commits into from
Nov 29, 2020
Merged

Bump to 2.13.4 and make sure CI is testing correct cross versions #426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94d4018
Bump to 2.13.4 and make sure CI is testing correct cross versions
ckipp01 Nov 28, 2020
dbb1f7e
Add in compat for 2.13 tests
ckipp01 Nov 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:
java: [adopt@1.8, adopt@1.11]
command:
- "'++2.11.12 test'"
- "'++2.12.11 test' scripted"
- "'++2.13.2 test'"
- "'++2.12.12 test' scripted"
- "'++2.13.4 test'"
- "'++3.0.0-M2 test'"
steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import scala.collection.mutable

def scala212 = "2.12.12"
def scala211 = "2.11.12"
def scala213 = "2.13.3"
def scala213 = "2.13.4"
def scala3 = List("3.0.0-M2")

def scalajs = "1.3.0"
Expand Down
10 changes: 5 additions & 5 deletions tests/unit/src/test/scala/tests/imports/DependencySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,16 @@ class DependencySuite extends BaseMarkdownSuite {
| not found: https://repo1.maven.org/maven2/org/scalameta/foobar/1.2.1/foobar-1.2.1.pom
|import $dep.`org.scalameta::mmunit:2.3.4`, $dep.`org.scalameta:foobar:1.2.1`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|error: dep-error.md:4:13: Error downloading org.scalameta:not-exists_2.13.2:2.3.4
|<redacted user.home>
| not found: https://repo1.maven.org/maven2/org/scalameta/not-exists_2.13.2/2.3.4/not-exists_2.13.2-2.3.4.pom
|import $dep.`org.scalameta:::not-exists:2.3.4`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|error: dep-error.md:3:13: Error downloading org.scalameta:mmunit_2.13:2.3.4
|<redacted user.home>
| not found: https://repo1.maven.org/maven2/org/scalameta/mmunit_2.13/2.3.4/mmunit_2.13-2.3.4.pom
|import $dep.`org.scalameta::mmunit:2.3.4`, $dep.`org.scalameta:foobar:1.2.1`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|error: dep-error.md:4:13: Error downloading org.scalameta:not-exists_2.13.4:2.3.4
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not 100% sure why the order flips here between 2.13.2 and 2.13.4 🤔

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's ok, the order should not matter here.

|<redacted user.home>
| not found: https://repo1.maven.org/maven2/org/scalameta/not-exists_2.13.4/2.3.4/not-exists_2.13.4-2.3.4.pom
|import $dep.`org.scalameta:::not-exists:2.3.4`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|""".stripMargin
)

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/src/test/scala/tests/markdown/AsyncSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class AsyncSuite extends BaseMarkdownSuite {
|java.util.concurrent.TimeoutException: Futures timed out after [10 milliseconds]
| at scala.concurrent.impl.Promise$DefaultPromise.ready(Promise.scala:259)
| at scala.concurrent.impl.Promise$DefaultPromise.result(Promise.scala:263)
| at scala.concurrent.Await$.$anonfun$result$1(package.scala:220)
| at scala.concurrent.Await$.$anonfun$result$1(package.scala:223)
| at scala.concurrent.BlockContext$DefaultBlockContext$.blockOn(BlockContext.scala:57)
| at scala.concurrent.Await$.result(package.scala:146)
| at repl.MdocSession$App.<init>(timeout.md:11)
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/src/test/scala/tests/markdown/BaseMarkdownSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ abstract class BaseMarkdownSuite extends tests.BaseSuite {
settings,
obtained => {
assertNoDiff(
Compat(obtained, Map.empty, postProcessObtained),
Compat(obtained, compat, postProcessObtained),
Compat(expected, compat, postProcessExpected)
)
}
Expand Down
23 changes: 23 additions & 0 deletions tests/unit/src/test/scala/tests/markdown/CrashSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,19 @@ class CrashSuite extends BaseMarkdownSuite {
|// at repl.MdocSession$App$$anonfun$3.apply(basic.md:14)
|// at repl.MdocSession$App$$anonfun$3.apply(basic.md:14)
|```
""".stripMargin,
compat = Map(
"2.13" ->
"""|```scala
|val x = 1
|???
|// scala.NotImplementedError: an implementation is missing
|// at scala.Predef$.$qmark$qmark$qmark(Predef.scala:347)
|// at repl.MdocSession$App$$anonfun$3.apply(basic.md:14)
|// at repl.MdocSession$App$$anonfun$3.apply(basic.md:14)
|```
""".stripMargin
)
)

checkError(
Expand Down Expand Up @@ -81,7 +93,18 @@ class CrashSuite extends BaseMarkdownSuite {
|// at repl.MdocSession$App$$anonfun$1.apply(relative.md:9)
|// at repl.MdocSession$App$$anonfun$1.apply(relative.md:9)
|```
""".stripMargin,
compat = Map(
"2.13" ->
"""|```scala
|???
|// scala.NotImplementedError: an implementation is missing
|// at scala.Predef$.$qmark$qmark$qmark(Predef.scala:347)
|// at repl.MdocSession$App$$anonfun$1.apply(relative.md:9)
|// at repl.MdocSession$App$$anonfun$1.apply(relative.md:9)
|```
""".stripMargin
)
)

check(
Expand Down
11 changes: 10 additions & 1 deletion tests/unit/src/test/scala/tests/markdown/ErrorSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,16 @@ class ErrorSuite extends BaseMarkdownSuite {
|^^^^^^^^^
|scala.NotImplementedError: an implementation is missing
| at scala.Predef$.$qmark$qmark$qmark(Predef.scala:288)
|""".stripMargin
|""".stripMargin,
compat = Map(
"2.13" ->
"""|error: crash.md:10:1: an implementation is missing
|x + y + z
|^^^^^^^^^
|scala.NotImplementedError: an implementation is missing
| at scala.Predef$.$qmark$qmark$qmark(Predef.scala:347)
|""".stripMargin
)
)

checkError(
Expand Down