chore: green up windows/mac for now

bazelbuild · Oct 10, 2023 · fdec721 · fdec721
1 parent 7cf634d
commit fdec721
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/.bazelci/misc.yml b/.bazelci/misc.yml
@@ -16,14 +16,19 @@ tasks:
     - "..."
     test_targets:
     - "..."
+    test_flags:
+    # FIXME: either have a docker/podman runtime on our Mac images,
+    # or use a remote container service like TestContainers Cloud
+    - "--test_tag_filters=-requires-docker"
   java-maven-windows:
     name: "Maven Java App"
     platform: windows
     working_directory: ../java-maven
-    build_targets:
-    - "..."
     test_targets:
-    - "..."
+    # FIXME: Our Windows CI machines need some DLL and/or Visual C++ redistributable.
+    # running bsdtar.exe results in `Exit -1073741515: STATUS_DLL_NOT_FOUND`
+    # for now, only run the java_test target.
+    - "//:tests"
   third-party-dependencies-linux:
     name: "Example with third party dependencies"
     platform: ubuntu1804

diff --git a/java-maven/BUILD b/java-maven/BUILD
@@ -48,4 +48,5 @@ container_structure_test(
     name = "container_test",
     configs = ["container-structure-test.yaml"],
     image = ":image",
+    tags = ["requires-docker"],
 )
diff --git a/java-maven/MODULE.bazel b/java-maven/MODULE.bazel
@@ -1,9 +1,9 @@
 "Bazel dependencies"
 
-bazel_dep(name = "aspect_bazel_lib", version = "2.0.0-beta1")
+bazel_dep(name = "aspect_bazel_lib", version = "2.0.0-rc0")
 bazel_dep(name = "container_structure_test", version = "1.16.0")
 bazel_dep(name = "rules_jvm_external", version = "5.3")
-bazel_dep(name = "rules_oci", version = "1.2.0")
+bazel_dep(name = "rules_oci", version = "1.4.0")
 
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 maven.install(