Skip to content

Commit 2e68211

Browse files
coeuvrecopybara-github
authored andcommitted
fix kythe pipeline
b/329055020 Closes bazelbuild#21923. PiperOrigin-RevId: 622845904 Change-Id: I5c773cb081e5ea6447061b9daf5b2d99ce3c3e87
1 parent c3dc389 commit 2e68211

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

.bazelci/postsubmit.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,9 @@ tasks:
383383
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/'
384384
-e 's/^# android_ndk_repository/android_ndk_repository/' WORKSPACE.bzlmod
385385
- rm -f WORKSPACE.bzlmod.bak
386+
# Remove _nowkt suffix because it's only available in newer protobuf releases. See b/329055020.
387+
# TODO(chiwang): Remove this once we have upgraded to protobuf 25+.
388+
- sed -i -e 's/protobuf_nowkt/protobuf/' /usr/local/kythe/BUILD
386389
index_flags:
387390
- "--define=kythe_corpus=github.com/bazelbuild/bazel"
388391
index_targets_query: "kind(\"cc_(binary|library|test|proto_library) rule\", ...) union kind(\"java_(binary|import|library|plugin|test|proto_library) rule\", ...) union kind(\"proto_library rule\", ...)"

.bazelci/presubmit.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,9 @@ tasks:
441441
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/'
442442
-e 's/^# android_ndk_repository/android_ndk_repository/' WORKSPACE.bzlmod
443443
- rm -f WORKSPACE.bzlmod.bak
444+
# Remove _nowkt suffix because it's only available in newer protobuf releases. See b/329055020.
445+
# TODO(chiwang): Remove this once we have upgraded to protobuf 25+.
446+
- sed -i -e 's/protobuf_nowkt/protobuf/' /usr/local/kythe/BUILD
444447
index_flags:
445448
- "--define=kythe_corpus=github.com/bazelbuild/bazel"
446449
index_targets_query: "kind(\"cc_(binary|library|test|proto_library) rule\", ...) union kind(\"java_(binary|import|library|plugin|test|proto_library) rule\", ...) union kind(\"proto_library rule\", ...)"

0 commit comments

Comments
 (0)