Fix windows CI

scala · Dec 13, 2021 · 3670c73 · 3670c73
1 parent 4b74afb
commit 3670c73
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -181,7 +181,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Test
-        run: sbt ";scala3-bootstrapped/compile ;scala3-bootstrapped/test"
+        run: sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test"
         shell: cmd
 
       - name: Scala.js Test

diff --git a/compiler/test/dotty/tools/scripting/ClasspathTests.scala b/compiler/test/dotty/tools/scripting/ClasspathTests.scala
@@ -31,7 +31,10 @@ class ClasspathTests:
       case None => sys.error(s"test script not found: ${testScriptName}")
       case Some(file) => file
 
-    val relpath = testScript.toPath.relpath.norm
+    val relpath = Some(testScript.toPath.relpath.norm).map {
+      case s if cygwin => s"$$(cygpath -aw $s)"
+      case s => s
+    }
     printf("===> hashbangClasspathVerifyTest for script [%s]\n", relpath)
     printf("bash is [%s]\n", bashExe)