Skip to content

Commit 62136ec

Browse files
committed
debugging why we compile protoc without register_toolchains
1 parent d025d52 commit 62136ec

File tree

6 files changed

+7
-10
lines changed

6 files changed

+7
-10
lines changed

.bazelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
run --workspace_status_command="bash tools/workspace-status.sh"
22
common --incompatible_enable_proto_toolchain_resolution
3+
# Ensure that we don't accidentally build protobuf
4+
common --per_file_copt=external/.*protobuf.*@--PROTOBUF_WAS_NOT_SUPPOSED_TO_BE_BUILT
5+
common --host_per_file_copt=external/.*protobuf.*@--PROTOBUF_WAS_NOT_SUPPOSED_TO_BE_BUILT

.github/workflows/ci.bazelrc

Lines changed: 0 additions & 2 deletions
This file was deleted.

.github/workflows/master.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
{
1111
"name": "Installing Bazel",
12-
"run": "v=$(cat .bazelversion) && curl -L https://github.com/bazelbuild/bazel/releases/download/${v}/bazel-${v}-linux-x86_64 > ~/bazel && chmod +x ~/bazel && echo ~ >> ${GITHUB_PATH} && ( [ -e .github/workflows/ci.bazelrc ] && cp .github/workflows/ci.bazelrc ~/.bazelrc )"
12+
"run": "v=$(cat .bazelversion) && curl -L https://github.com/bazelbuild/bazel/releases/download/${v}/bazel-${v}-linux-x86_64 > ~/bazel && chmod +x ~/bazel && echo ~ >> ${GITHUB_PATH}"
1313
},
1414
{
1515
"name": "Bazel mod tidy",

.github/workflows/pull-requests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
{
1111
"name": "Installing Bazel",
12-
"run": "v=$(cat .bazelversion) && curl -L https://github.com/bazelbuild/bazel/releases/download/${v}/bazel-${v}-linux-x86_64 > ~/bazel && chmod +x ~/bazel && echo ~ >> ${GITHUB_PATH} && ( [ -e .github/workflows/ci.bazelrc ] && cp .github/workflows/ci.bazelrc ~/.bazelrc )"
12+
"run": "v=$(cat .bazelversion) && curl -L https://github.com/bazelbuild/bazel/releases/download/${v}/bazel-${v}-linux-x86_64 > ~/bazel && chmod +x ~/bazel && echo ~ >> ${GITHUB_PATH}"
1313
},
1414
{
1515
"name": "Bazel mod tidy",

MODULE.bazel

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,9 @@ single_version_override(
3232
patches = ["//:patches/jsonnet/bazel-8.diff"],
3333
)
3434

35-
protoc = use_extension("@toolchains_protoc//protoc:extensions.bzl", "protoc")
36-
3735
# Match protobuf above, until it ships a pre-built binary toolchain itself
36+
protoc = use_extension("@toolchains_protoc//protoc:extensions.bzl", "protoc")
3837
protoc.toolchain(version = "v29.3")
39-
use_repo(protoc, "toolchains_protoc_hub")
40-
41-
register_toolchains("@toolchains_protoc_hub//:all")
4238

4339
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")
4440
go_sdk.download(version = "1.24.0")

tools/github_workflows/workflows_template.libsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
},
6767
{
6868
name: 'Installing Bazel',
69-
run: 'v=$(cat .bazelversion) && curl -L https://github.com/bazelbuild/bazel/releases/download/${v}/bazel-${v}-linux-x86_64 > ~/bazel && chmod +x ~/bazel && echo ~ >> ${GITHUB_PATH} && ( [ -e .github/workflows/ci.bazelrc ] && cp .github/workflows/ci.bazelrc ~/.bazelrc )',
69+
run: 'v=$(cat .bazelversion) && curl -L https://github.com/bazelbuild/bazel/releases/download/${v}/bazel-${v}-linux-x86_64 > ~/bazel && chmod +x ~/bazel && echo ~ >> ${GITHUB_PATH}',
7070
},
7171
{
7272
name: 'Bazel mod tidy',

0 commit comments

Comments
 (0)