revert: update Bazel to v7 (#13319)

coryan · web-flow · commit 07860330d919 · 2023-12-15T11:56:37.000-05:00
This reverts commit bb6dc52.
diff --git a/.bazelrc b/.bazelrc
@@ -39,13 +39,6 @@ build --experimental_convenience_symlinks=ignore
 # frustrating when they fail and don't give any output. So, remove the limit.
 build --experimental_ui_max_stdouterr_bytes=-1
 
-# TODO(#11485) - enable bzlmod once it works
-common --noenable_bzlmod
-
-# TODO(#13311) - remove once gRPC works with Bazel v7 or when gRPC stops using
-#     `apple_rules`.
-common:macos --repo_env=BAZEL_NO_APPLE_CPP_TOOLCHAIN=1
-
 # Inject ${GTEST_SHUFFLE} and ${GTEST_RANDOM_SEED} into the test environment
 # if they are set in the enclosing environment. This allows for running tests
 # in a random order to help expose undesirable interdependencies.
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
@@ -20,27 +20,6 @@ google_cloud_cpp_development_deps()
 
 google_cloud_cpp_deps()
 
-load(
-    "@build_bazel_rules_apple//apple:repositories.bzl",
-    "apple_rules_dependencies",
-)
-
-apple_rules_dependencies()
-
-load(
-    "@build_bazel_apple_support//lib:repositories.bzl",
-    "apple_support_dependencies",
-)
-
-apple_support_dependencies()
-
-load(
-    "@rules_cc//cc:repositories.bzl",
-    "rules_cc_dependencies",
-)
-
-rules_cc_dependencies()
-
 # Configure @com_google_googleapis to only compile C++ and gRPC libraries.
 load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
 
diff --git a/bazel/google_cloud_cpp_deps.bzl b/bazel/google_cloud_cpp_deps.bzl
@@ -127,17 +127,6 @@ def google_cloud_cpp_deps(name = None):
         strip_prefix = "rules_cc-0.0.9",
     )
 
-    # The version of `rules_apple` loaded by gRPC is too old for Bazel 6 or 7.
-    maybe(
-        http_archive,
-        name = "build_bazel_rules_apple",
-        urls = [
-            "https://storage.googleapis.com/cloud-cpp-community-archive/build_bazel_rules_apple/rules_apple.3.1.1.tar.gz",
-            "https://github.com/bazelbuild/rules_apple/releases/download/3.1.1/rules_apple.3.1.1.tar.gz",
-        ],
-        sha256 = "34c41bfb59cdaea29ac2df5a2fa79e5add609c71bb303b2ebb10985f93fa20e7",
-    )
-
     # Load Abseil
     maybe(
         http_archive,
diff --git a/ci/cloudbuild/builds/lib/bazel.sh b/ci/cloudbuild/builds/lib/bazel.sh
@@ -26,7 +26,7 @@ fi # include guard
 source module ci/lib/io.sh
 
 # Selects a default bazel version, though individual builds can override this.
-: "${USE_BAZEL_VERSION:="7.0.0"}"
+: "${USE_BAZEL_VERSION:="6.4.0"}"
 export USE_BAZEL_VERSION
 io::log "Using bazelisk version"
 bazelisk version
diff --git a/ci/cloudbuild/builds/quickstart-bazel.sh b/ci/cloudbuild/builds/quickstart-bazel.sh
@@ -16,10 +16,6 @@
 
 set -euo pipefail
 
-# TODO(#13313) - upgrade to Bazel v7.
-: "${USE_BAZEL_VERSION:="6.4.0"}"
-export USE_BAZEL_VERSION
-
 source "$(dirname "$0")/../../lib/init.sh"
 source module ci/cloudbuild/builds/lib/bazel.sh
 source module ci/etc/quickstart-config.sh
diff --git a/ci/gha/builds/lib/bazel.sh b/ci/gha/builds/lib/bazel.sh
@@ -23,8 +23,10 @@ fi # include guard
 source module ci/lib/io.sh
 
 # Selects a default bazel version, though individual builds can override this.
-: "${USE_BAZEL_VERSION:="7.0.0"}"
+: "${USE_BAZEL_VERSION:="6.4.0"}"
 export USE_BAZEL_VERSION
+io::log "Using bazelisk version"
+bazelisk version
 
 # Outputs a list of args that should be given to all bazel invocations. To read
 # this into an array use `mapfile -t my_array < <(bazel::common_args)`
@@ -94,26 +96,9 @@ function bazel::prefetch() {
   )
   local os_rules
   mapfile -t os_rules < <(os::prefetch)
-  if [[ -n "${VCINSTALLDIR:-}" ]]; then
-    # This is needed by `bazel fetch`
-    export BAZEL_VC="${VCINSTALLDIR}"
-  fi
   "ci/retry-command.sh" 3 120 bazelisk "${args[@]}" fetch "${common_rules[@]}" "${os_rules[@]}"
 }
 
-function bazel::info() {
-  local args
-  mapfile -t args < <(bazel::common_args)
-
-  io::log_h1 "Using bazelisk version"
-  bazelisk "${args[@]}" version
-
-  io::log_h1 "Bazel Info"
-  bazelisk "${args[@]}" info
-}
-
-bazel::info
-
 io::log "Prefetching bazel deps..."
 TIMEFORMAT="==> 🕑 prefetching done in %R seconds"
 time {
diff --git a/ci/gha/builds/macos-bazel.sh b/ci/gha/builds/macos-bazel.sh
@@ -17,8 +17,8 @@
 set -euo pipefail
 
 source "$(dirname "$0")/../../lib/init.sh"
-source module ci/gha/builds/lib/macos.sh
 source module ci/gha/builds/lib/bazel.sh
+source module ci/gha/builds/lib/macos.sh
 source module ci/lib/io.sh
 
 # Usage: macos-bazel.sh [bazel query expression]
diff --git a/ci/verify_current_targets/.bazelrc b/ci/verify_current_targets/.bazelrc
@@ -28,6 +28,3 @@ build:macos --host_cxxopt=-std=c++14
 # runs inside a docker image or if one builds a quickstart and then builds
 # the project separately.
 build --experimental_convenience_symlinks=ignore
-
-# TODO(#11485) - enable bzlmod once it works
-common --noenable_bzlmod
diff --git a/ci/verify_current_targets/WORKSPACE.bazel b/ci/verify_current_targets/WORKSPACE.bazel
@@ -28,27 +28,6 @@ load("@google_cloud_cpp//bazel:google_cloud_cpp_deps.bzl", "google_cloud_cpp_dep
 
 google_cloud_cpp_deps()
 
-load(
-    "@build_bazel_rules_apple//apple:repositories.bzl",
-    "apple_rules_dependencies",
-)
-
-apple_rules_dependencies()
-
-load(
-    "@build_bazel_apple_support//lib:repositories.bzl",
-    "apple_support_dependencies",
-)
-
-apple_support_dependencies()
-
-load(
-    "@rules_cc//cc:repositories.bzl",
-    "rules_cc_dependencies",
-)
-
-rules_cc_dependencies()
-
 load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
 
 switched_rules_by_language(
diff --git a/ci/verify_deprecated_targets/.bazelrc b/ci/verify_deprecated_targets/.bazelrc
@@ -28,6 +28,3 @@ build:macos --host_cxxopt=-std=c++14
 # runs inside a docker image or if one builds a quickstart and then builds
 # the project separately.
 build --experimental_convenience_symlinks=ignore
-
-# TODO(#11485) - enable bzlmod once it works
-common --noenable_bzlmod
diff --git a/ci/verify_deprecated_targets/WORKSPACE.bazel b/ci/verify_deprecated_targets/WORKSPACE.bazel
@@ -30,27 +30,6 @@ load("@google_cloud_cpp//bazel:google_cloud_cpp_deps.bzl", "google_cloud_cpp_dep
 
 google_cloud_cpp_deps()
 
-load(
-    "@build_bazel_rules_apple//apple:repositories.bzl",
-    "apple_rules_dependencies",
-)
-
-apple_rules_dependencies()
-
-load(
-    "@build_bazel_apple_support//lib:repositories.bzl",
-    "apple_support_dependencies",
-)
-
-apple_support_dependencies()
-
-load(
-    "@rules_cc//cc:repositories.bzl",
-    "rules_cc_dependencies",
-)
-
-rules_cc_dependencies()
-
 load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
 
 switched_rules_by_language(
diff --git a/generator/internal/scaffold_generator.cc b/generator/internal/scaffold_generator.cc
@@ -1140,9 +1140,6 @@ build:macos --host_cxxopt=-std=c++14
 # runs inside a docker image or if one builds a quickstart and then builds
 # the project separately.
 build --experimental_convenience_symlinks=ignore
-
-# TODO(#11485) - enable bzlmod once it works
-common --noenable_bzlmod
 )""";
   google::protobuf::io::OstreamOutputStream output(&os);
   google::protobuf::io::Printer printer(&output, '$');
diff --git a/generator/templates/WORKSPACE.bazel b/generator/templates/WORKSPACE.bazel
@@ -34,28 +34,6 @@ load("@google_cloud_cpp//bazel:google_cloud_cpp_deps.bzl", "google_cloud_cpp_dep
 
 google_cloud_cpp_deps()
 
-load(
-    "@build_bazel_rules_apple//apple:repositories.bzl",
-    "apple_rules_dependencies",
-)
-
-apple_rules_dependencies()
-
-load(
-    "@build_bazel_apple_support//lib:repositories.bzl",
-    "apple_support_dependencies",
-)
-
-apple_support_dependencies()
-
-load(
-    "@rules_cc//cc:repositories.bzl",
-    "rules_cc_dependencies",
-)
-
-rules_cc_dependencies()
-
-# Configure @com_google_googleapis to only compile C++ and gRPC libraries.
 load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
 
 switched_rules_by_language(
