Enable some tests on Bazel's CI

- Re-enable workspace_resolved_test in postsubmit.
- Fix #6405: Test //src/tools/singlejar/... on CI.

Closes #6609.

PiperOrigin-RevId: 220277765
diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml
index 4ec4608..e09d583 100644
--- a/.bazelci/postsubmit.yml
+++ b/.bazelci/postsubmit.yml
@@ -13,10 +13,9 @@
     - "--"
     - "//scripts/..."
     - "//src/test/..."
+    - "//src/tools/singlejar/..."
     - "//third_party/ijar/..."
     - "//tools/android/..."
-    # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/6479
-    - "-//src/test/shell/bazel:workspace_resolved_test"
   ubuntu1604:
     shell_commands:
     - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -30,10 +29,9 @@
     - "--"
     - "//scripts/..."
     - "//src/test/..."
+    - "//src/tools/singlejar/..."
     - "//third_party/ijar/..."
     - "//tools/android/..."
-    # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/6479
-    - "-//src/test/shell/bazel:workspace_resolved_test"
   ubuntu1804:
     shell_commands:
     - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -47,10 +45,9 @@
     - "--"
     - "//scripts/..."
     - "//src/test/..."
+    - "//src/tools/singlejar/..."
     - "//third_party/ijar/..."
     - "//tools/android/..."
-    # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/6479
-    - "-//src/test/shell/bazel:workspace_resolved_test"
   ubuntu1804_nojava:
     build_flags:
     - "--javabase=@openjdk_linux_archive//:runtime"
@@ -63,6 +60,7 @@
     - "--"
     - "//scripts/..."
     - "//src/test/..."
+    - "//src/tools/singlejar/..."
     - "//third_party/ijar/..."
     # We can't run Android tests without an installed Android SDK / NDK.
     - "-//src/test/java/com/google/devtools/build/android/..."
@@ -102,8 +100,7 @@
     - "-//src/test/shell/integration:output_filter_test"
     - "-//src/test/shell/integration:stub_finds_runfiles_test"
     - "-//src/test/shell/integration:test_test"
-    # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/6479
-    - "-//src/test/shell/bazel:workspace_resolved_test"
+    - "-//src/tools/singlejar:zip64_test"
   ubuntu1804_java9:
     shell_commands:
     - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -117,10 +114,9 @@
     - "--"
     - "//scripts/..."
     - "//src/test/..."
+    - "//src/tools/singlejar/..."
     - "//third_party/ijar/..."
     - "//tools/android/..."
-    # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/6479
-    - "-//src/test/shell/bazel:workspace_resolved_test"
   ubuntu1804_java10:
     shell_commands:
     - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -134,10 +130,9 @@
     - "--"
     - "//scripts/..."
     - "//src/test/..."
+    - "//src/tools/singlejar/..."
     - "//third_party/ijar/..."
     - "//tools/android/..."
-    # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/6479
-    - "-//src/test/shell/bazel:workspace_resolved_test"
   macos:
     shell_commands:
     - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -151,10 +146,9 @@
     - "--"
     - "//scripts/..."
     - "//src/test/..."
+    - "//src/tools/singlejar/..."
     - "//third_party/ijar/..."
     - "//tools/android/..."
-    # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/6479
-    - "-//src/test/shell/bazel:workspace_resolved_test"
   windows:
     build_flags:
     - "--copt=-w"
@@ -173,8 +167,6 @@
     test_targets:
     - "--"
     - "//src:all_windows_tests"
-    # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/6479
-    - "-//src/test/shell/bazel:workspace_resolved_test"
   rbe_ubuntu1604:
     shell_commands:
     - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 0b28c1e..0e49acf 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -13,6 +13,7 @@
     - "--"
     - "//scripts/..."
     - "//src/test/..."
+    - "//src/tools/singlejar/..."
     - "//third_party/ijar/..."
     - "//tools/android/..."
     # Disable Slow Tests
@@ -32,6 +33,7 @@
     - "--"
     - "//scripts/..."
     - "//src/test/..."
+    - "//src/tools/singlejar/..."
     - "//third_party/ijar/..."
     - "//tools/android/..."
     # Disable Slow Tests
@@ -51,6 +53,7 @@
     - "--"
     - "//scripts/..."
     - "//src/test/..."
+    - "//src/tools/singlejar/..."
     - "//third_party/ijar/..."
     - "//tools/android/..."
     # Disable Slow Tests
@@ -69,6 +72,7 @@
     - "--"
     - "//scripts/..."
     - "//src/test/..."
+    - "//src/tools/singlejar/..."
     - "//third_party/ijar/..."
     # Disable Slow Tests
     - "-//src/test/shell/bazel:bazel_determinism_test"
@@ -110,6 +114,7 @@
     - "-//src/test/shell/integration:output_filter_test"
     - "-//src/test/shell/integration:stub_finds_runfiles_test"
     - "-//src/test/shell/integration:test_test"
+    - "-//src/tools/singlejar:zip64_test"
   ubuntu1804_java9:
     shell_commands:
     - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -123,6 +128,7 @@
     - "--"
     - "//scripts/..."
     - "//src/test/..."
+    - "//src/tools/singlejar/..."
     - "//third_party/ijar/..."
     - "//tools/android/..."
     # Disable Slow Tests
@@ -142,6 +148,7 @@
     - "--"
     - "//scripts/..."
     - "//src/test/..."
+    - "//src/tools/singlejar/..."
     - "//third_party/ijar/..."
     - "//tools/android/..."
     # Disable Slow Tests
@@ -161,6 +168,7 @@
     - "--"
     - "//scripts/..."
     - "//src/test/..."
+    - "//src/tools/singlejar/..."
     - "//third_party/ijar/..."
     - "//tools/android/..."
     # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4663