Fix build failures in bzlmod/no-bzlmod and update CI

Author: luispadron

.bazelci/presubmit.yml

@@ -48,22 +48,19 @@ x_defaults:
       - "//tools/..."
 
 tasks:
-  # TODO: Uncomment once Bazel 8 is released
-  # macos_7:
-  #   name: "Previous LTS"
-  #   bazel: 7.x
-  #   <<: *mac_common
+  macos_7:
+    name: "Previous LTS with no bzlmod"
+    bazel: 7.x
+    build_flags:
+      - "--noenable_bzlmod"
+      - "--enable_workspace"
+    <<: *mac_common
 
   macos_latest:
     name: "Current LTS"
     bazel: latest
     <<: *mac_common
 
-  macos_latest_bzlmod:
-    name: "Current LTS using bzlmod"
-    bazel: latest
-    <<: *mac_common
-
   macos_last_green:
     name: "Last Green Bazel"
     bazel: last_green
@@ -78,15 +75,17 @@ tasks:
     - .bazelci/update_workspace_to_deps_heads.sh
     <<: *mac_common
 
-  # TODO: Uncomment once Bazel 8 is released
-  # ubuntu2004_7:
-  #   name: "Previous LTS"
-  #   bazel: 7.x
-  #   shell_commands:
-  #     - "echo --- Downloading and extracting Swift $SWIFT_VERSION to $SWIFT_HOME"
-  #     - "mkdir $SWIFT_HOME"
-  #     - "curl https://download.swift.org/swift-${SWIFT_VERSION}-release/ubuntu2004/swift-${SWIFT_VERSION}-RELEASE/swift-${SWIFT_VERSION}-RELEASE-ubuntu20.04.tar.gz | tar xvz --strip-components=1 -C $SWIFT_HOME"
-  #   <<: *linux_common
+  ubuntu2004_7:
+    name: "Previous LTS with no bzlmod"
+    bazel: 7.x
+    shell_commands:
+      - "echo --- Downloading and extracting Swift $SWIFT_VERSION to $SWIFT_HOME"
+      - "mkdir $SWIFT_HOME"
+      - "curl https://download.swift.org/swift-${SWIFT_VERSION}-release/ubuntu2004/swift-${SWIFT_VERSION}-RELEASE/swift-${SWIFT_VERSION}-RELEASE-ubuntu20.04.tar.gz | tar xvz --strip-components=1 -C $SWIFT_HOME"
+    build_flags:
+      - "--noenable_bzlmod"
+      - "--enable_workspace"
+    <<: *linux_common
 
   ubuntu2004_latest:
     name: "Current LTS"
@@ -135,9 +134,5 @@ tasks:
       - "curl https://download.swift.org/swift-${SWIFT_VERSION}-release/ubuntu2004/swift-${SWIFT_VERSION}-RELEASE/swift-${SWIFT_VERSION}-RELEASE-ubuntu20.04.tar.gz | tar xvz --strip-components=1 -C $SWIFT_HOME"
     test_targets:
     - "doc/..."
-    # TODO: Remove this once stardoc is updated to 0.7.1+ (https://github.com/bazelbuild/stardoc/pull/238)
-    test_flags:
-    - "--action_env=PATH"
-    - "--noincompatible_disallow_empty_glob"
 
-buildifier: 6.3.2
+buildifier: 8.2.0

MODULE.bazel

@@ -12,7 +12,7 @@ bazel_dep(name = "apple_support", version = "1.21.0", repo_name = "build_bazel_a
 bazel_dep(name = "rules_cc", version = "0.0.2")
 bazel_dep(name = "rules_shell", version = "0.3.0")
 bazel_dep(name = "platforms", version = "0.0.9")
-bazel_dep(name = "protobuf", version = "21.7", repo_name = "com_google_protobuf")
+bazel_dep(name = "protobuf", version = "23.1", repo_name = "com_google_protobuf")
 bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
 bazel_dep(name = "nlohmann_json", version = "3.6.1", repo_name = "com_github_nlohmann_json")
 bazel_dep(
@@ -45,7 +45,7 @@ register_toolchains("@build_bazel_rules_swift_local_config//:all")
 # Dev dependencies
 bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.5.0", dev_dependency = True)
 bazel_dep(name = "gazelle", version = "0.33.0", dev_dependency = True, repo_name = "bazel_gazelle")
-bazel_dep(name = "stardoc", version = "0.6.2", dev_dependency = True, repo_name = "io_bazel_stardoc")
+bazel_dep(name = "stardoc", version = "0.7.1", dev_dependency = True, repo_name = "io_bazel_stardoc")
 
 http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
@@ -56,20 +56,3 @@ http_archive(
     strip_prefix = "swift-syntax-01fc3e3ed4d26121c06790abf8fe5ddaa22a4cc5",
     url = "https://github.com/apple/swift-syntax/archive/01fc3e3ed4d26121c06790abf8fe5ddaa22a4cc5.tar.gz",
 )
-
-# TODO: Remove override when a protobuf release is available that supports
-# Bazel 8
-archive_override(
-    module_name = "protobuf",
-    integrity = "sha256-+dloYVexGlGsxKLTARuU4KXZ5ORo/BWPR6obFk73d+Q=",
-    strip_prefix = "protobuf-b93b8e5f64ed922d101759380d7c6a2bbe474e26",
-    urls = ["https://github.com/protocolbuffers/protobuf/archive/b93b8e5f64ed922d101759380d7c6a2bbe474e26.zip"],
-)
-
-# TODO: Remove override when a protobuf release that marks `stardoc` as a
-# dev_dependency is available, until then it's upgrading our stardoc version
-# so override it here.
-single_version_override(
-    module_name = "stardoc",
-    version = "0.6.2",
-)

swift/internal/BUILD

@@ -229,12 +229,6 @@ bzl_library(
     ],
 )
 
-bzl_library(
-    name = "runfiles",
-    srcs = ["runfiles.bzl"],
-    visibility = ["//swift:__subpackages__"],
-)
-
 bzl_library(
     name = "swift_autoconfiguration",
     srcs = ["swift_autoconfiguration.bzl"],