diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cb24e96a..7fb3b6cc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: java: 11 distribution: temurin jobtype: 2 - - os: windows-latest + - os: windows-2025 java: 8 distribution: zulu jobtype: 3 diff --git a/io/src/test/scala/sbt/internal/io/SourceModificationWatchSpec.scala b/io/src/test/scala/sbt/internal/io/SourceModificationWatchSpec.scala index de85f0d5..68095e14 100644 --- a/io/src/test/scala/sbt/internal/io/SourceModificationWatchSpec.scala +++ b/io/src/test/scala/sbt/internal/io/SourceModificationWatchSpec.scala @@ -97,21 +97,16 @@ private[sbt] trait EventMonitorSpec { self: AnyFlatSpec & Matchers => it should "ignore creation of files that are explicitly ignored" in IO .withTemporaryDirectory { dir => - // TODO https://github.com/sbt/io/issues/434 - if (scala.util.Properties.isWin) { - pending - } else { - val parentDir = dir / "src" / "watchme" - val created = parentDir / ".hidden.scala" - val notIgnored = parentDir / "foo.scala" + val parentDir = dir / "src" / "watchme" + val created = parentDir / ".hidden.scala" + val notIgnored = parentDir / "foo.scala" - IO.createDirectory(parentDir) + IO.createDirectory(parentDir) - assert(watchTest(parentDir, AllPass, excludes(created.toPath)) { - randomTouch(created) - randomTouch(notIgnored) - }) - } + assert(watchTest(parentDir, AllPass, excludes(created.toPath)) { + randomTouch(created) + randomTouch(notIgnored) + }) } it should "ignore creation of an empty directory" in IO.withTemporaryDirectory { dir => @@ -196,20 +191,18 @@ private[sbt] trait EventMonitorSpec { self: AnyFlatSpec & Matchers => it should "ignore deletion of files not included in inclusion filter" in IO .withTemporaryDirectory { dir => - // TODO https://github.com/sbt/io/issues/434 if (scala.util.Properties.isWin) { - pending - } else { - val parentDir = dir / "src" / "watchme" - val file = parentDir / "inme" - IO.write(file, "foo") - val source = parentDir / "foo.scala" - - assert(watchTest(parentDir, AllPass, excludes(file.toPath)) { - IO.delete(file) - randomTouch(source) - }) + pending // TODO } + val parentDir = dir / "src" / "watchme" + val file = parentDir / "inme" + IO.write(file, "foo") + val source = parentDir / "foo.scala" + + assert(watchTest(parentDir, AllPass, excludes(file.toPath)) { + IO.delete(file) + randomTouch(source) + }) } it should "ignore deletion of files explicitly ignored" in IO.withTemporaryDirectory { dir =>