From 94d4018f04364570d99058298995ec830f6c7787 Mon Sep 17 00:00:00 2001 From: ckipp01 Date: Sat, 28 Nov 2020 14:34:41 +0100 Subject: [PATCH 1/2] Bump to 2.13.4 and make sure CI is testing correct cross versions --- .github/workflows/ci.yml | 4 ++-- build.sbt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d402e464..a780bc064 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/build.sbt b/build.sbt index f20db9cba..4780fab93 100644 --- a/build.sbt +++ b/build.sbt @@ -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" From dbb1f7e534a795ee309fa9388e8b5d0fc9649ff0 Mon Sep 17 00:00:00 2001 From: ckipp01 Date: Sun, 29 Nov 2020 12:06:06 +0100 Subject: [PATCH 2/2] Add in compat for 2.13 tests --- .../scala/tests/imports/DependencySuite.scala | 10 ++++---- .../scala/tests/markdown/AsyncSuite.scala | 2 +- .../tests/markdown/BaseMarkdownSuite.scala | 2 +- .../scala/tests/markdown/CrashSuite.scala | 23 +++++++++++++++++++ .../scala/tests/markdown/ErrorSuite.scala | 11 ++++++++- 5 files changed, 40 insertions(+), 8 deletions(-) diff --git a/tests/unit/src/test/scala/tests/imports/DependencySuite.scala b/tests/unit/src/test/scala/tests/imports/DependencySuite.scala index dff618ee8..27639b7b0 100644 --- a/tests/unit/src/test/scala/tests/imports/DependencySuite.scala +++ b/tests/unit/src/test/scala/tests/imports/DependencySuite.scala @@ -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 - | - | 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 | | 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 + | + | 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 ) diff --git a/tests/unit/src/test/scala/tests/markdown/AsyncSuite.scala b/tests/unit/src/test/scala/tests/markdown/AsyncSuite.scala index f32db8f11..fe1e4bb49 100644 --- a/tests/unit/src/test/scala/tests/markdown/AsyncSuite.scala +++ b/tests/unit/src/test/scala/tests/markdown/AsyncSuite.scala @@ -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.(timeout.md:11) diff --git a/tests/unit/src/test/scala/tests/markdown/BaseMarkdownSuite.scala b/tests/unit/src/test/scala/tests/markdown/BaseMarkdownSuite.scala index b9fb848f6..2921b7a64 100644 --- a/tests/unit/src/test/scala/tests/markdown/BaseMarkdownSuite.scala +++ b/tests/unit/src/test/scala/tests/markdown/BaseMarkdownSuite.scala @@ -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) ) } diff --git a/tests/unit/src/test/scala/tests/markdown/CrashSuite.scala b/tests/unit/src/test/scala/tests/markdown/CrashSuite.scala index 31aece82c..5fedb3da0 100644 --- a/tests/unit/src/test/scala/tests/markdown/CrashSuite.scala +++ b/tests/unit/src/test/scala/tests/markdown/CrashSuite.scala @@ -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( @@ -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( diff --git a/tests/unit/src/test/scala/tests/markdown/ErrorSuite.scala b/tests/unit/src/test/scala/tests/markdown/ErrorSuite.scala index 26a757dd9..134271627 100644 --- a/tests/unit/src/test/scala/tests/markdown/ErrorSuite.scala +++ b/tests/unit/src/test/scala/tests/markdown/ErrorSuite.scala @@ -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(