fix: revert to Bazel 6.4.0 and fix BCR presubmit failure (#693)

[BCR presubmit failure](https://buildkite.com/bazel/bcr-presubmit/builds/2308#018b68a0-d7fb-4c67-9208-90a1b2146581) I think that 7.0.0rc2 is [not catching missing repositories](https://bazelbuild.slack.com/archives/C014RARENH0/p1698239007055249). For now, revert to 6.4.0. Add missing `local_config_apple_cc`.
cgrindel · Oct 26, 2023 · 58d7745 · 58d7745
1 parent ad7602f
commit 58d7745
Show file tree

Hide file tree

Showing 22 changed files with 140 additions and 2 deletions.
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-7.0.0rc2
+6.4.0
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -37,6 +37,12 @@ bazel_dep(
     repo_name = "bazel_gazelle",
 )
 
+apple_cc_configure = use_extension(
+    "@apple_support//crosstool:setup.bzl",
+    "apple_cc_configure_extension",
+)
+use_repo(apple_cc_configure, "local_config_apple_cc")
+
 go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
 go_deps.from_file(go_mod = "//:go.mod")
 use_repo(

diff --git a/bzlmod/workspace/MODULE.bazel b/bzlmod/workspace/MODULE.bazel
@@ -31,6 +31,12 @@ bazel_dep(
     repo_name = "bazel_gazelle",
 )
 
+apple_cc_configure = use_extension(
+    "@apple_support//crosstool:setup.bzl",
+    "apple_cc_configure_extension",
+)
+use_repo(apple_cc_configure, "local_config_apple_cc")
+
 # swift_deps START
 swift_deps = use_extension(
     "@rules_swift_package_manager//:extensions.bzl",

diff --git a/examples/firebase_example/MODULE.bazel b/examples/firebase_example/MODULE.bazel
@@ -36,6 +36,12 @@ bazel_dep(
     repo_name = "bazel_gazelle",
 )
 
+apple_cc_configure = use_extension(
+    "@apple_support//crosstool:setup.bzl",
+    "apple_cc_configure_extension",
+)
+use_repo(apple_cc_configure, "local_config_apple_cc")
+
 # swift_deps START
 swift_deps = use_extension(
     "@rules_swift_package_manager//:extensions.bzl",

diff --git a/examples/grpc_example/MODULE.bazel b/examples/grpc_example/MODULE.bazel
@@ -57,6 +57,12 @@ bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
 # If they fix this, we can remove the repo_name argument.
 bazel_dep(name = "protobuf", version = "21.7", repo_name = "com_google_protobuf")
 
+apple_cc_configure = use_extension(
+    "@apple_support//crosstool:setup.bzl",
+    "apple_cc_configure_extension",
+)
+use_repo(apple_cc_configure, "local_config_apple_cc")
+
 # swift_deps START
 swift_deps = use_extension(
     "@rules_swift_package_manager//:extensions.bzl",

diff --git a/examples/http_archive_ext_deps/MODULE.bazel b/examples/http_archive_ext_deps/MODULE.bazel
@@ -27,6 +27,12 @@ bazel_dep(
     repo_name = "bazel_gazelle",
 )
 
+apple_cc_configure = use_extension(
+    "@apple_support//crosstool:setup.bzl",
+    "apple_cc_configure_extension",
+)
+use_repo(apple_cc_configure, "local_config_apple_cc")
+
 non_module_deps = use_extension("//:extensions.bzl", "non_module_deps")
 use_repo(
     non_module_deps,

diff --git a/examples/interesting_deps/MODULE.bazel b/examples/interesting_deps/MODULE.bazel
@@ -36,6 +36,12 @@ bazel_dep(
     repo_name = "bazel_gazelle",
 )
 
+apple_cc_configure = use_extension(
+    "@apple_support//crosstool:setup.bzl",
+    "apple_cc_configure_extension",
+)
+use_repo(apple_cc_configure, "local_config_apple_cc")
+
 # swift_deps START
 swift_deps = use_extension(
     "@rules_swift_package_manager//:extensions.bzl",
@@ -52,6 +58,7 @@ use_repo(
     "swiftpkg_opencombine",
     "swiftpkg_swift_log",
 )
+
 # swift_deps END
 swift_deps.configure_package(
     name = "swiftpkg_libwebp_xcode",

diff --git a/examples/ios_sim/MODULE.bazel b/examples/ios_sim/MODULE.bazel
@@ -41,6 +41,12 @@ bazel_dep(
     dev_dependency = True,
 )
 
+apple_cc_configure = use_extension(
+    "@apple_support//crosstool:setup.bzl",
+    "apple_cc_configure_extension",
+)
+use_repo(apple_cc_configure, "local_config_apple_cc")
+
 # swift_deps START
 swift_deps = use_extension(
     "@rules_swift_package_manager//:extensions.bzl",

diff --git a/examples/lottie_ios_example/MODULE.bazel b/examples/lottie_ios_example/MODULE.bazel
@@ -9,6 +9,7 @@ local_path_override(
 
 bazel_dep(name = "cgrindel_bazel_starlib", version = "0.18.1")
 bazel_dep(name = "bazel_skylib", version = "1.4.2")
+bazel_dep(name = "apple_support", version = "1.11.1")
 bazel_dep(
     name = "rules_swift",
     version = "1.13.0",
@@ -31,6 +32,13 @@ bazel_dep(
     dev_dependency = True,
     repo_name = "bazel_gazelle",
 )
+
+apple_cc_configure = use_extension(
+    "@apple_support//crosstool:setup.bzl",
+    "apple_cc_configure_extension",
+)
+use_repo(apple_cc_configure, "local_config_apple_cc")
+
 # swift_deps START
 swift_deps = use_extension(
     "@rules_swift_package_manager//:extensions.bzl",

diff --git a/examples/messagekit_example/MODULE.bazel b/examples/messagekit_example/MODULE.bazel
@@ -9,6 +9,7 @@ local_path_override(
 
 bazel_dep(name = "cgrindel_bazel_starlib", version = "0.18.1")
 bazel_dep(name = "bazel_skylib", version = "1.4.2")
+bazel_dep(name = "apple_support", version = "1.11.1")
 bazel_dep(
     name = "rules_swift",
     version = "1.13.0",
@@ -31,6 +32,13 @@ bazel_dep(
     dev_dependency = True,
     repo_name = "bazel_gazelle",
 )
+
+apple_cc_configure = use_extension(
+    "@apple_support//crosstool:setup.bzl",
+    "apple_cc_configure_extension",
+)
+use_repo(apple_cc_configure, "local_config_apple_cc")
+
 # swift_deps START
 swift_deps = use_extension(
     "@rules_swift_package_manager//:extensions.bzl",

diff --git a/examples/nimble_example/MODULE.bazel b/examples/nimble_example/MODULE.bazel
@@ -9,6 +9,7 @@ local_path_override(
 
 bazel_dep(name = "cgrindel_bazel_starlib", version = "0.18.1")
 bazel_dep(name = "bazel_skylib", version = "1.4.2")
+bazel_dep(name = "apple_support", version = "1.11.1")
 bazel_dep(
     name = "rules_swift",
     version = "1.13.0",
@@ -32,7 +33,13 @@ bazel_dep(
     repo_name = "bazel_gazelle",
 )
 
-# # swift_deps START
+apple_cc_configure = use_extension(
+    "@apple_support//crosstool:setup.bzl",
+    "apple_cc_configure_extension",
+)
+use_repo(apple_cc_configure, "local_config_apple_cc")
+
+# swift_deps START
 swift_deps = use_extension(
     "@rules_swift_package_manager//:extensions.bzl",
     "swift_deps",

diff --git a/examples/objc_code/MODULE.bazel b/examples/objc_code/MODULE.bazel
@@ -36,6 +36,12 @@ bazel_dep(
     repo_name = "bazel_gazelle",
 )
 
+apple_cc_configure = use_extension(
+    "@apple_support//crosstool:setup.bzl",
+    "apple_cc_configure_extension",
+)
+use_repo(apple_cc_configure, "local_config_apple_cc")
+
 # swift_deps START
 swift_deps = use_extension(
     "@rules_swift_package_manager//:extensions.bzl",

diff --git a/examples/phone_number_kit/MODULE.bazel b/examples/phone_number_kit/MODULE.bazel
@@ -9,6 +9,7 @@ local_path_override(
 
 bazel_dep(name = "cgrindel_bazel_starlib", version = "0.18.1")
 bazel_dep(name = "bazel_skylib", version = "1.4.2")
+bazel_dep(name = "apple_support", version = "1.11.1")
 bazel_dep(
     name = "rules_swift",
     version = "1.13.0",
@@ -32,6 +33,12 @@ bazel_dep(
     repo_name = "bazel_gazelle",
 )
 
+apple_cc_configure = use_extension(
+    "@apple_support//crosstool:setup.bzl",
+    "apple_cc_configure_extension",
+)
+use_repo(apple_cc_configure, "local_config_apple_cc")
+
 # swift_deps START
 swift_deps = use_extension(
     "@rules_swift_package_manager//:extensions.bzl",

diff --git a/examples/pkg_manifest_minimal/MODULE.bazel b/examples/pkg_manifest_minimal/MODULE.bazel
@@ -31,6 +31,12 @@ bazel_dep(
     repo_name = "bazel_gazelle",
 )
 
+apple_cc_configure = use_extension(
+    "@apple_support//crosstool:setup.bzl",
+    "apple_cc_configure_extension",
+)
+use_repo(apple_cc_configure, "local_config_apple_cc")
+
 # swift_deps START
 swift_deps = use_extension(
     "@rules_swift_package_manager//:extensions.bzl",

diff --git a/examples/resources_example/MODULE.bazel b/examples/resources_example/MODULE.bazel
@@ -9,6 +9,7 @@ local_path_override(
 
 bazel_dep(name = "cgrindel_bazel_starlib", version = "0.18.1")
 bazel_dep(name = "bazel_skylib", version = "1.4.2")
+bazel_dep(name = "apple_support", version = "1.11.1")
 bazel_dep(
     name = "rules_swift",
     version = "1.13.0",
@@ -32,6 +33,12 @@ bazel_dep(
     repo_name = "bazel_gazelle",
 )
 
+apple_cc_configure = use_extension(
+    "@apple_support//crosstool:setup.bzl",
+    "apple_cc_configure_extension",
+)
+use_repo(apple_cc_configure, "local_config_apple_cc")
+
 # swift_deps START
 swift_deps = use_extension(
     "@rules_swift_package_manager//:extensions.bzl",

diff --git a/examples/shake_ios_example/MODULE.bazel b/examples/shake_ios_example/MODULE.bazel
@@ -9,6 +9,7 @@ local_path_override(
 
 bazel_dep(name = "cgrindel_bazel_starlib", version = "0.18.1")
 bazel_dep(name = "bazel_skylib", version = "1.4.2")
+bazel_dep(name = "apple_support", version = "1.11.1")
 bazel_dep(
     name = "rules_swift",
     version = "1.13.0",
@@ -31,6 +32,13 @@ bazel_dep(
     dev_dependency = True,
     repo_name = "bazel_gazelle",
 )
+
+apple_cc_configure = use_extension(
+    "@apple_support//crosstool:setup.bzl",
+    "apple_cc_configure_extension",
+)
+use_repo(apple_cc_configure, "local_config_apple_cc")
+
 # swift_deps START
 swift_deps = use_extension(
     "@rules_swift_package_manager//:extensions.bzl",

diff --git a/examples/snapkit_example/MODULE.bazel b/examples/snapkit_example/MODULE.bazel
@@ -9,6 +9,7 @@ local_path_override(
 
 bazel_dep(name = "cgrindel_bazel_starlib", version = "0.18.1")
 bazel_dep(name = "bazel_skylib", version = "1.4.2")
+bazel_dep(name = "apple_support", version = "1.11.1")
 bazel_dep(
     name = "rules_swift",
     version = "1.13.0",
@@ -31,6 +32,13 @@ bazel_dep(
     dev_dependency = True,
     repo_name = "bazel_gazelle",
 )
+
+apple_cc_configure = use_extension(
+    "@apple_support//crosstool:setup.bzl",
+    "apple_cc_configure_extension",
+)
+use_repo(apple_cc_configure, "local_config_apple_cc")
+
 # swift_deps START
 swift_deps = use_extension(
     "@rules_swift_package_manager//:extensions.bzl",

diff --git a/examples/soto_example/MODULE.bazel b/examples/soto_example/MODULE.bazel
@@ -36,6 +36,12 @@ bazel_dep(
     repo_name = "bazel_gazelle",
 )
 
+apple_cc_configure = use_extension(
+    "@apple_support//crosstool:setup.bzl",
+    "apple_cc_configure_extension",
+)
+use_repo(apple_cc_configure, "local_config_apple_cc")
+
 # swift_deps START
 swift_deps = use_extension(
     "@rules_swift_package_manager//:extensions.bzl",

diff --git a/examples/stripe_example/MODULE.bazel b/examples/stripe_example/MODULE.bazel
@@ -36,6 +36,12 @@ bazel_dep(
     repo_name = "bazel_gazelle",
 )
 
+apple_cc_configure = use_extension(
+    "@apple_support//crosstool:setup.bzl",
+    "apple_cc_configure_extension",
+)
+use_repo(apple_cc_configure, "local_config_apple_cc")
+
 # swift_deps START
 swift_deps = use_extension(
     "@rules_swift_package_manager//:extensions.bzl",

diff --git a/examples/tca_example/MODULE.bazel b/examples/tca_example/MODULE.bazel
@@ -32,6 +32,12 @@ bazel_dep(
     repo_name = "bazel_gazelle",
 )
 
+apple_cc_configure = use_extension(
+    "@apple_support//crosstool:setup.bzl",
+    "apple_cc_configure_extension",
+)
+use_repo(apple_cc_configure, "local_config_apple_cc")
+
 # swift_deps START
 swift_deps = use_extension(
     "@rules_swift_package_manager//:extensions.bzl",

diff --git a/examples/vapor_example/MODULE.bazel b/examples/vapor_example/MODULE.bazel
@@ -36,6 +36,12 @@ bazel_dep(
     repo_name = "bazel_gazelle",
 )
 
+apple_cc_configure = use_extension(
+    "@apple_support//crosstool:setup.bzl",
+    "apple_cc_configure_extension",
+)
+use_repo(apple_cc_configure, "local_config_apple_cc")
+
 # swift_deps START
 swift_deps = use_extension(
     "@rules_swift_package_manager//:extensions.bzl",

diff --git a/examples/xcmetrics_example/MODULE.bazel b/examples/xcmetrics_example/MODULE.bazel
@@ -31,6 +31,12 @@ bazel_dep(
     repo_name = "bazel_gazelle",
 )
 
+apple_cc_configure = use_extension(
+    "@apple_support//crosstool:setup.bzl",
+    "apple_cc_configure_extension",
+)
+use_repo(apple_cc_configure, "local_config_apple_cc")
+
 # swift_deps START
 swift_deps = use_extension(
     "@rules_swift_package_manager//:extensions.bzl",