Skip to content

Commit 0d8c253

Browse files
Upgrade protobuf for dev and allow empty globs to fix HEAD CI (bazelbuild#1420)
Signed-off-by: Brentley Jones <[email protected]>
1 parent 0179dac commit 0d8c253

File tree

2 files changed

+21
-0
lines changed

2 files changed

+21
-0
lines changed

.bazelci/presubmit.yml

+4
Original file line numberDiff line numberDiff line change
@@ -134,5 +134,9 @@ tasks:
134134
- "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"
135135
test_targets:
136136
- "doc/..."
137+
# TODO: Remove this once stardoc is updated to 0.7.1+ (https://github.com/bazelbuild/stardoc/pull/238)
138+
test_flags:
139+
- "--action_env=PATH"
140+
- "--noincompatible_disallow_empty_glob"
137141

138142
buildifier: 6.3.2

MODULE.bazel

+17
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,20 @@ http_archive(
5454
strip_prefix = "swift-syntax-01fc3e3ed4d26121c06790abf8fe5ddaa22a4cc5",
5555
url = "https://github.com/apple/swift-syntax/archive/01fc3e3ed4d26121c06790abf8fe5ddaa22a4cc5.tar.gz",
5656
)
57+
58+
# TODO: Remove override when a protobuf release is available that supports
59+
# Bazel 8
60+
archive_override(
61+
module_name = "protobuf",
62+
integrity = "sha256-+dloYVexGlGsxKLTARuU4KXZ5ORo/BWPR6obFk73d+Q=",
63+
strip_prefix = "protobuf-b93b8e5f64ed922d101759380d7c6a2bbe474e26",
64+
urls = ["https://github.com/protocolbuffers/protobuf/archive/b93b8e5f64ed922d101759380d7c6a2bbe474e26.zip"],
65+
)
66+
67+
# TODO: Remove override when a protobuf release that marks `stardoc` as a
68+
# dev_dependency is available, until then it's upgrading our stardoc version
69+
# so override it here.
70+
single_version_override(
71+
module_name = "stardoc",
72+
version = "0.6.2",
73+
)

0 commit comments

Comments
 (0)