Skip to content

Commit 043d976

Browse files
hvadehrarules_java Copybara
authored and
rules_java Copybara
committed
Enable @rules_java integration tests on windows
PiperOrigin-RevId: 746475348 Change-Id: I675d9415ef16e3d2b67cb7cc3ab4d0c0133bb916
1 parent 5017641 commit 043d976

File tree

4 files changed

+24
-5
lines changed

4 files changed

+24
-5
lines changed

.bazelci/presubmit.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ buildifier: latest
4747

4848
matrix:
4949
all_platforms: ["ubuntu2004", "macos", "macos_arm64", "windows"]
50-
integration_platforms: ["ubuntu2004", "macos", "macos_arm64"] # TODO: add windows batch setup script
50+
integration_platforms: ["ubuntu2004", "macos", "macos_arm64", "windows"]
5151
bazel: ["7.4.0", "8.1.0", "last_green"] # Bazel 6 tested separately, needs different flags
5252
modern_bazel: ["8.1.0", "last_green"] # Fully supported Bazel versions
5353

@@ -80,10 +80,12 @@ tasks:
8080
ubuntu2004_integration_bazel6:
8181
name: "Integration w/ Bazel 6.5.0"
8282
bazel: 6.5.0
83-
platform: ubuntu2004
83+
platform: ${{ integration_platforms }}
8484
working_directory: "test/repo"
8585
shell_commands:
8686
- sh setup.sh
87+
batch_commands:
88+
- setup.bat
8789
build_targets: *build_targets_integration
8890
test_targets: *test_target_integration
8991

@@ -95,6 +97,8 @@ tasks:
9597
working_directory: "test/repo"
9698
shell_commands:
9799
- sh setup.sh
100+
batch_commands:
101+
- setup.bat
98102
build_targets: *build_targets_integration
99103
test_targets: *test_target_integration
100104
integration_build_and_test_workspace:
@@ -104,6 +108,8 @@ tasks:
104108
working_directory: "test/repo"
105109
shell_commands:
106110
- sh setup.sh
111+
batch_commands:
112+
- setup.bat
107113
build_targets: *build_targets_integration
108114
build_flags: *flags_workspace_integration
109115
test_targets: *test_target_integration

test/repo/MODULE.bazel

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,20 @@ module(name = "integration_test_repo")
33
bazel_dep(name = "rules_java", version = "7.5.0")
44
archive_override(
55
module_name = "rules_java",
6-
urls = ["file:///tmp/rules_java-HEAD.tar.gz"],
6+
urls = [
7+
"file:///tmp/rules_java-HEAD.tar.gz",
8+
"file:///C:/b/rules_java-HEAD.tar.gz",
9+
],
710
)
811

912
http_jar = use_repo_rule("@rules_java//java:http_jar.bzl", "http_jar")
1013

1114
http_jar(
1215
name = "my_jar",
13-
urls = ["file:///tmp/my_jar.jar"],
16+
urls = [
17+
"file:///tmp/my_jar.jar",
18+
"file:///C:/b/my_jar.jar",
19+
],
1420
)
1521

1622
java_toolchains = use_extension("@rules_java//java:extensions.bzl", "toolchains")

test/repo/WORKSPACE

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ load("@rules_java//java:http_jar.bzl", "http_jar")
2323

2424
http_jar(
2525
name = "my_jar",
26-
urls = ["file:///tmp/my_jar.jar"],
26+
urls = [
27+
"file:///tmp/my_jar.jar",
28+
"file:///C:/b/my_jar.jar",
29+
],
2730
)
2831

2932
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

test/repo/setup.bat

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
cd ../../
2+
bazel build //distro:all //test/testdata:my_jar
3+
cp -f ./bazel-bin/distro/*.tar.gz C:/b/rules_java-HEAD.tar.gz
4+
cp -f bazel-bin/test/testdata/libmy_jar.jar C:/b/my_jar.jar

0 commit comments

Comments
 (0)