Skip to content

Fix windows Buildkit CI #1649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,11 @@ tasks:
test_rules_scala_win:
name: "./test_rules_scala"
platform: windows
shell_commands:
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 -lc \"pacman --noconfirm --needed -S libxml2\"" #tests require xmllint
- "bash test_rules_scala.sh"
test_coverage_linux_6_5_0:
name: "./test_coverage"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down