From 3ff0c296b99b7661f690e643e67d41833661a9fb Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Thu, 19 Nov 2020 10:56:50 -0800 Subject: [PATCH 1/2] Sort scripted tests We're seeing errors in github actions that may be related to scripted test ordering. --- .../src/main/scala/sbt/scriptedtest/ScriptedTests.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/scripted-sbt-redux/src/main/scala/sbt/scriptedtest/ScriptedTests.scala b/scripted-sbt-redux/src/main/scala/sbt/scriptedtest/ScriptedTests.scala index b0a653598..880d78098 100644 --- a/scripted-sbt-redux/src/main/scala/sbt/scriptedtest/ScriptedTests.scala +++ b/scripted-sbt-redux/src/main/scala/sbt/scriptedtest/ScriptedTests.scala @@ -140,6 +140,7 @@ final class ScriptedTests( def createTestRunners(tests: Seq[TestInfo]): Seq[TestRunner] = { tests + .sortBy(_._1) .grouped(batchSize) .map { batch => () => IO.withTemporaryDirectory { From f6e7e3a867ec1f2fdd545ca0c622c445b5911dd9 Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Thu, 19 Nov 2020 11:15:13 -0800 Subject: [PATCH 2/2] Revert "Mark project/src-scala-binary-version as pending" This reverts commit 3d02f8902eade8151a94459228d5985bd9f9174a. --- .../sbt-test/project/src-scala-binary-version/{pending => test} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sbt/src/sbt-test/project/src-scala-binary-version/{pending => test} (100%) diff --git a/sbt/src/sbt-test/project/src-scala-binary-version/pending b/sbt/src/sbt-test/project/src-scala-binary-version/test similarity index 100% rename from sbt/src/sbt-test/project/src-scala-binary-version/pending rename to sbt/src/sbt-test/project/src-scala-binary-version/test