Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ buildifier:
# Use a specific version to avoid skew issues when new versions are released.
version: 8.2.1
warnings: "all"
# NOTE: Minimum supported version is 7.x
# NOTE: Minimum supported version is 8.x
.minimum_supported_version: &minimum_supported_version
# For testing minimum supported version.
# NOTE: Keep in sync with //:version.bzl
bazel: 7.x
skip_in_bazel_downstream_pipeline: "Bazel 7 required"
bazel: 8.x
skip_in_bazel_downstream_pipeline: "Bazel 8 required"
.reusable_config: &reusable_config
build_targets:
- "--"
Expand All @@ -43,6 +43,7 @@ buildifier:
.common_workspace_flags_min_bazel: &common_workspace_flags_min_bazel
build_flags:
- "--noenable_bzlmod"
- "--enabled_workspace"
- "--build_tag_filters=-integration-test"
test_flags:
- "--noenable_bzlmod"
Expand All @@ -57,7 +58,7 @@ buildifier:
- "--noenable_bzlmod"
- "--enable_workspace"
- "--build_tag_filters=-integration-test"
bazel: 7.x
bazel: 8.x
# NOTE: The Mac and Windows bazelinbazel jobs override parts of this config.
.common_bazelinbazel_config: &common_bazelinbazel_config
build_flags:
Expand Down Expand Up @@ -118,7 +119,7 @@ matrix:
- debian11
- macos_arm64
- windows
bazel: [7.*, 8.*, 9.*]
bazel: [8.*, 9.*]

tasks:
# Keep in sync with .bcr/presubmit.yml
Expand Down Expand Up @@ -184,7 +185,7 @@ tasks:
<<: *reusable_config
name: "Default: Ubuntu, bzlmod, minimum Bazel"
platform: ubuntu2204
bazel: 7.x
bazel: 8.x
ubuntu:
<<: *reusable_config
name: "Default: Ubuntu"
Expand Down Expand Up @@ -281,8 +282,6 @@ tasks:
<<: *reusable_config
name: "RBE: Ubuntu"
platform: rbe_ubuntu2204
# TODO @aignas 2024-12-11: get the RBE working in CI for bazel 8.0
# See https://github.com/bazelbuild/rules_python/issues/2499
bazel: 8.x
test_flags:
- "--test_tag_filters=-integration-test,-acceptance-test"
Expand Down Expand Up @@ -372,7 +371,7 @@ tasks:
name: "examples/pip_parse: Ubuntu, bzlmod, minimum supported Bazel version"
working_directory: examples/pip_parse
platform: ubuntu2204
bazel: 7.x
bazel: 8.x
integration_test_pip_parse_ubuntu:
<<: *reusable_build_test_all
name: "examples/pip_parse: Ubuntu"
Expand Down Expand Up @@ -561,7 +560,7 @@ tasks:
name: "compile_pip_requirements_test_from_external_repo: Ubuntu, bzlmod, minimum Bazel"
working_directory: tests/integration/compile_pip_requirements_test_from_external_repo
platform: ubuntu2204
bazel: 7.x
bazel: 8.x
shell_commands:
# Assert that @compile_pip_requirements//:requirements_test does the right thing.
- "bazel test @compile_pip_requirements//..."
Expand Down
2 changes: 0 additions & 2 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,6 @@ bazel_binaries.local(
name = "self",
path = "tests/integration/bazel_from_env",
)
bazel_binaries.download(version = "7.4.1")
bazel_binaries.download(version = "8.0.0")
bazel_binaries.download(version = "9.0.0rc1")
use_repo(
Expand All @@ -365,7 +364,6 @@ use_repo(
# These don't appear necessary, but are reported as direct dependencies
# that should be use_repo()'d, so we add them as requested
"bazel_binaries_bazelisk",
"build_bazel_bazel_7_4_1",
"build_bazel_bazel_8_0_0",
"build_bazel_bazel_9_0_0rc1",
# "build_bazel_bazel_rolling",
Expand Down
2 changes: 2 additions & 0 deletions tests/bootstrap_impls/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
load("@rules_shell//shell:sh_test.bzl", "sh_test")
load("//python:py_test.bzl", "py_test")
load("//python/private:reexports.bzl", "BuiltinPyInfo") # buildifier: disable=bzl-visibility
load("//tests/support:py_reconfig.bzl", "py_reconfig_binary", "py_reconfig_test")
load("//tests/support:sh_py_run_test.bzl", "sh_py_run_test")
load("//tests/support:support.bzl", "SUPPORTS_BOOTSTRAP_SCRIPT")
Expand Down Expand Up @@ -112,6 +113,7 @@ py_reconfig_test(
# Necessary because bazel_tools doesn't have __init__.py files.
legacy_create_init = True,
main = "bazel_tools_importable_test.py",
target_compatible_with = [] if BuiltinPyInfo else ["@platforms//:incompatible"],
deps = [
"@bazel_tools//tools/python/runfiles",
],
Expand Down
1 change: 0 additions & 1 deletion tests/integration/compile_pip_requirements/.bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ test --test_output=errors

# Windows requires these for multi-python support:
build --enable_runfiles
common:bazel7.x --incompatible_python_disallow_native_rules
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
test --test_output=errors
common:bazel7.x --incompatible_python_disallow_native_rules
1 change: 0 additions & 1 deletion tests/integration/local_toolchains/.bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@ common --lockfile_mode=off
test --test_output=errors
# Windows requires these for multi-python support:
build --enable_runfiles
common:bazel7.x --incompatible_python_disallow_native_rules
build --//:py=local
common --announce_rc
2 changes: 0 additions & 2 deletions tests/integration/pip_parse/.bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,3 @@ build --enable_runfiles

# https://docs.bazel.build/versions/main/best-practices.html#using-the-bazelrc-file
try-import %workspace%/user.bazelrc

common:bazel7.x --incompatible_python_disallow_native_rules
1 change: 0 additions & 1 deletion tests/integration/py_cc_toolchain_registered/.bazelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# This aids debugging on failure
build --toolchain_resolution_debug=python
common:bazel7.x --incompatible_python_disallow_native_rules