22build_targets : &build_targets
33 - " //..."
44 - " @remote_java_tools//java_tools/..."
5- # TODO: Look into broken targets in //toolchains
5+ # can't build @remote_java_tools_X repos for other platforms
66 - " -//toolchains/..."
7- # TODO: re-enable docs after protobuf is fixed
7+ # TODO: re-enable docs after moving them out of https://bazel.build/reference/be/java
88 - " -//java/docs/..."
99 - " -//test:docs_up_to_date_test"
1010
@@ -13,9 +13,25 @@ build_targets_bazel6: &build_targets_bazel6
1313 - " @remote_java_tools//java_tools/..."
1414 - " //examples/..."
1515
16+ build_targets_integration : &build_targets_integration
17+ - " //..."
18+ - " //:bin_deploy.jar"
19+
1620test_targets : &test_targets
1721 - " //test/..."
1822 - " //java/test/..."
23+ # TODO: re-enable docs after moving them out of https://bazel.build/reference/be/java
24+ - " -//test:docs_up_to_date_test"
25+
26+ test_targets_bazel6 : &test_targets_bazel6
27+ - " //java/test/..."
28+
29+ test_target_integration : &test_target_integration
30+ - " //:MyTest"
31+
32+ flags_workspace_integration : &flags_workspace_integration
33+ - " --noenable_bzlmod"
34+ - " --enable_workspace"
1935
2036buildifier : latest
2137
@@ -26,41 +42,27 @@ tasks:
2642 name : " Bazel 7.x"
2743 bazel : " 7.4.0"
2844 build_targets : *build_targets
29- test_targets :
30- - " //test/..."
31- - " //java/test/..."
32- - " -//test:docs_up_to_date_test"
45+ test_targets : *test_targets
3346 ubuntu2004_integration :
3447 name : " Bazel 7.x Integration"
3548 bazel : " 7.4.0"
3649 platform : ubuntu2004
3750 working_directory : " test/repo"
3851 shell_commands :
3952 - sh setup.sh
40- build_targets :
41- - " //..."
42- - " //:bin_deploy.jar"
43- - " @rules_java//java/..."
44- test_targets :
45- - " //:MyTest"
53+ build_targets : *build_targets_integration
54+ test_targets : *test_target_integration
4655 ubuntu2004_integration_workspace :
4756 name : " Bazel 7.x Integration (WORKSPACE)"
4857 bazel : " 7.4.0"
4958 platform : ubuntu2004
5059 working_directory : " test/repo"
5160 shell_commands :
5261 - sh setup.sh
53- build_targets :
54- - " //..."
55- - " //:bin_deploy.jar"
56- build_flags :
57- - " --noenable_bzlmod"
58- - " --enable_workspace"
59- test_targets :
60- - " //:MyTest"
61- test_flags :
62- - " --noenable_bzlmod"
63- - " --enable_workspace"
62+ build_targets : *build_targets_integration
63+ build_flags : *flags_workspace_integration
64+ test_targets : *test_target_integration
65+ test_flags : *flags_workspace_integration
6466 macos :
6567 name : " Bazel 7.x"
6668 bazel : " 7.4.0"
@@ -75,37 +77,27 @@ tasks:
7577 bazel : last_green
7678 platform : ubuntu2004
7779 build_targets : *build_targets
80+ test_targets : *test_targets
7881 ubuntu2004_integration_head :
7982 name : " Bazel@HEAD Integration"
8083 bazel : last_green
8184 platform : ubuntu2004
8285 working_directory : " test/repo"
8386 shell_commands :
8487 - sh setup.sh
85- build_targets :
86- - " //..."
87- - " //:bin_deploy.jar"
88- - " @rules_java//java/..."
89- test_targets :
90- - " //:MyTest"
88+ build_targets : *build_targets_integration
89+ test_targets : *test_target_integration
9190 ubuntu2004_integration_head_workspace :
9291 name : " Bazel@HEAD Integration (WORKSPACE)"
9392 bazel : " last_green"
9493 platform : ubuntu2004
9594 working_directory : " test/repo"
9695 shell_commands :
9796 - sh setup.sh
98- build_targets :
99- - " //..."
100- - " //:bin_deploy.jar"
101- build_flags :
102- - " --noenable_bzlmod"
103- - " --enable_workspace"
104- test_targets :
105- - " //:MyTest"
106- test_flags :
107- - " --noenable_bzlmod"
108- - " --enable_workspace"
97+ build_targets : *build_targets_integration
98+ build_flags : *flags_workspace_integration
99+ test_targets : *test_target_integration
100+ test_flags : *flags_workspace_integration
109101 macos_head :
110102 name : " Bazel@HEAD"
111103 bazel : last_green
@@ -123,18 +115,16 @@ tasks:
123115 bazel : 6.4.0
124116 platform : ubuntu2004
125117 build_targets : *build_targets_bazel6
118+ test_targets : *test_targets_bazel6
126119 ubuntu2004_integration_bazel6 :
127120 name : " Bazel 6.x Integration"
128121 bazel : 6.4.0
129122 platform : ubuntu2004
130123 working_directory : " test/repo"
131124 shell_commands :
132125 - sh setup.sh
133- build_targets :
134- - " //..."
135- - " //:bin_deploy.jar"
136- test_targets :
137- - " //:MyTest"
126+ build_targets : *build_targets_integration
127+ test_targets : *test_target_integration
138128 macos_bazel6 :
139129 name : " Bazel 6.x"
140130 bazel : 6.4.0
0 commit comments