Skip to content

Commit fe0eb48

Browse files
authored
Merge branch 'main' into target_compatible_with_for_pip_compile_update
2 parents 3620848 + 32527de commit fe0eb48

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

.bazelci/presubmit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ tasks:
296296
<<: *minimum_supported_version
297297
<<: *reusable_config
298298
name: "RBE: Ubuntu, minimum Bazel"
299-
platform: rbe_ubuntu2204
299+
platform: rbe_ubuntu2404
300300
build_flags:
301301
- "--experimental_repository_cache_hardlinks=false"
302302
# BazelCI sets --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1,
@@ -315,7 +315,7 @@ tasks:
315315
rbe:
316316
<<: *reusable_config
317317
name: "RBE: Ubuntu"
318-
platform: rbe_ubuntu2204
318+
platform: rbe_ubuntu2404
319319
# TODO @aignas 2024-12-11: get the RBE working in CI for bazel 8.0
320320
# See https://github.com/bazelbuild/rules_python/issues/2499
321321
bazel: 8.x

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ bazel_dep(name = "bazel_features", version = "1.21.0")
88
bazel_dep(name = "bazel_skylib", version = "1.8.2")
99
bazel_dep(name = "package_metadata", version = "0.0.7")
1010
bazel_dep(name = "platforms", version = "0.0.11")
11-
bazel_dep(name = "rules_cc", version = "0.1.5")
11+
bazel_dep(name = "rules_cc", version = "0.2.17")
1212

1313
# Those are loaded only when using py_proto_library
1414
# Use py_proto_library directly from protobuf repository

python/private/internal_dev_deps.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def _internal_dev_deps_impl(mctx):
2626
# otherwise refer to RBE docs.
2727
rbe_preconfig(
2828
name = "buildkite_config",
29-
toolchain = "ubuntu2204",
29+
toolchain = "ubuntu2404",
3030
)
3131
runtime_env_repo(name = "rules_python_runtime_env_tc_info")
3232

0 commit comments

Comments
 (0)