From bf323abb9b10c2bc54bbbf92def77b467a3ac52c Mon Sep 17 00:00:00 2001 From: Brice Jaglin Date: Sun, 25 Feb 2024 00:15:15 +0100 Subject: [PATCH] run more scripted tests on recent JDKs --- .github/workflows/ci.yml | 4 ++-- src/sbt-test/skip-windows/caching/test | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bbb44de7..a5eaa6fe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: - uses: coursier/setup-action@v1 with: jvm: temurin:17 - - run: sbt "test; scripted sbt-scalafix/*" + - run: sbt "test; scripted sbt-*/* skip-windows/*" jdk21: name: JDK21 tests runs-on: ubuntu-latest @@ -40,7 +40,7 @@ jobs: - uses: olafurpg/setup-scala@v14 with: jvm: temurin:17 - - run: sbt "test; scripted sbt-scalafix/*" + - run: sbt "test; scripted sbt-*/* skip-windows/*" windows: name: Windows tests runs-on: windows-latest diff --git a/src/sbt-test/skip-windows/caching/test b/src/sbt-test/skip-windows/caching/test index 4a7e7b36..e51710c0 100644 --- a/src/sbt-test/skip-windows/caching/test +++ b/src/sbt-test/skip-windows/caching/test @@ -1,3 +1,7 @@ +# make sure unmanagedSources does not silently exclude 000-chmoded files on recent +# sbt versions (where input files are stamped with Hash by default) +> set unmanagedSources / inputFileStamper := sbt.nio.FileStamper.LastModified + # a re-run after a no-op, successful run should be cached > set scalafixConfig := Some(file("files/DisableSyntaxNull.scalafix.conf")) $ mkdir src/main/scala