From 3911e4a89cb67eb39b5ec9dadb354ea36fe99224 Mon Sep 17 00:00:00 2001 From: crt-31 Date: Wed, 13 Nov 2024 10:15:27 -0800 Subject: [PATCH 1/5] make windows CI work again - windows buildkite needs batch_commands instead of shell_commands --- .bazelci/presubmit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index eb7528dd0..20475cc7b 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -46,7 +46,7 @@ tasks: test_rules_scala_win: name: "./test_rules_scala" platform: windows - shell_commands: + batch_commands: - "bash test_rules_scala.sh" test_coverage_linux_6_5_0: name: "./test_coverage" From 84e4a74e6668b0a43186ca8db6243b82e08fb81c Mon Sep 17 00:00:00 2001 From: crt-31 Date: Fri, 15 Nov 2024 17:07:19 -0800 Subject: [PATCH 2/5] Fixed tests to pass on windows when autocrlf=false --- .../child/ScalaLibResourcesDuplicatedTest.scala | 4 ++-- .../test/resources/ScalaLibResourcesFromExternalDepTest.scala | 2 +- .../resources/ScalaLibResourcesFromExternalScalaTest.scala | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/src/main/scala/scalarules/test/duplicated_resources/child/ScalaLibResourcesDuplicatedTest.scala b/test/src/main/scala/scalarules/test/duplicated_resources/child/ScalaLibResourcesDuplicatedTest.scala index 7af8791af..22b04dae0 100644 --- a/test/src/main/scala/scalarules/test/duplicated_resources/child/ScalaLibResourcesDuplicatedTest.scala +++ b/test/src/main/scala/scalarules/test/duplicated_resources/child/ScalaLibResourcesDuplicatedTest.scala @@ -5,8 +5,8 @@ import org.scalatest.funsuite._ class ScalaLibResourcesDuplicatedTest extends AnyFunSuite { test("Scala library depends on resource + deps that contains same name resources, have higher priority on this target's resource.") { - //Using platform dependent newline (%n) - assert(get("/resource.txt") === String.format("I am a text resource from child!%n")) + + assert(get("/resource.txt") === String.format("I am a text resource from child!\n")) } private def get(s: String): String = diff --git a/test/src/main/scala/scalarules/test/resources/ScalaLibResourcesFromExternalDepTest.scala b/test/src/main/scala/scalarules/test/resources/ScalaLibResourcesFromExternalDepTest.scala index 088ec71a3..0097d99f9 100644 --- a/test/src/main/scala/scalarules/test/resources/ScalaLibResourcesFromExternalDepTest.scala +++ b/test/src/main/scala/scalarules/test/resources/ScalaLibResourcesFromExternalDepTest.scala @@ -7,7 +7,7 @@ class ScalaLibResourcesFromExternalDepTest extends SpecWithJUnit { "Scala library depending on resources from external resource-only jar" >> { "allow to load resources" >> { - val expectedString = String.format("A resource%n"); //Using platform dependent newline (%n) + val expectedString = String.format("A resource\n"); get("/resource.txt") must beEqualTo(expectedString) } diff --git a/test/src/main/scala/scalarules/test/resources/ScalaLibResourcesFromExternalScalaTest.scala b/test/src/main/scala/scalarules/test/resources/ScalaLibResourcesFromExternalScalaTest.scala index 599ca7edf..9949115d4 100644 --- a/test/src/main/scala/scalarules/test/resources/ScalaLibResourcesFromExternalScalaTest.scala +++ b/test/src/main/scala/scalarules/test/resources/ScalaLibResourcesFromExternalScalaTest.scala @@ -5,7 +5,7 @@ import org.scalatest.funsuite._ class ScalaLibResourcesFromExternalScalaTest extends AnyFunSuite { test("Scala library depending on resources from external resource-only jar should allow to load resources") { - val expectedString = String.format("A resource%n"); //Using platform dependent newline (%n) + val expectedString = String.format("A resource\n"); assert(get("/resource.txt") === expectedString) } From 70815d18d0c97d0f132c46ff5a3fe59a5cc42a98 Mon Sep 17 00:00:00 2001 From: crt-31 Date: Fri, 15 Nov 2024 17:38:58 -0800 Subject: [PATCH 3/5] Added MSYS2_ARG_CONV_EXCL=* to windows CI This is needed to handle targets (with //) that are passed as args --- .bazelci/presubmit.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 20475cc7b..5ddcd03e9 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -46,6 +46,8 @@ tasks: test_rules_scala_win: name: "./test_rules_scala" platform: windows + environment: + MSYS2_ARG_CONV_EXCL: "*" batch_commands: - "bash test_rules_scala.sh" test_coverage_linux_6_5_0: From 3a5826b1f1756f9ae150e4e36cd4eb8e0fbc3a93 Mon Sep 17 00:00:00 2001 From: crt-31 Date: Fri, 15 Nov 2024 19:49:42 -0800 Subject: [PATCH 4/5] Set PATH when running windows tests --- .bazelci/presubmit.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 5ddcd03e9..cca0d691b 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -49,6 +49,7 @@ tasks: environment: MSYS2_ARG_CONV_EXCL: "*" batch_commands: + - "set PATH=/usr/bin;%PATH%" #Make sure bash uses msys commands over windows commands. (i.e. find). - "bash test_rules_scala.sh" test_coverage_linux_6_5_0: name: "./test_coverage" From 8daa7b28cf933154334b3f2350fbd07064c75a67 Mon Sep 17 00:00:00 2001 From: crt-31 Date: Fri, 6 Dec 2024 16:23:59 -0800 Subject: [PATCH 5/5] Explicity add libxml2 to Windows CI environment --- .bazelci/presubmit.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index cca0d691b..a9ff4aa18 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -50,6 +50,7 @@ tasks: MSYS2_ARG_CONV_EXCL: "*" batch_commands: - "set PATH=/usr/bin;%PATH%" #Make sure bash uses msys commands over windows commands. (i.e. find). + - "bash -lc \"pacman --noconfirm --needed -S libxml2\"" #tests require xmllint - "bash test_rules_scala.sh" test_coverage_linux_6_5_0: name: "./test_coverage"