Skip to content

Commit

Permalink
Pin Bazel version to 5.4.0 (#17986)
Browse files Browse the repository at this point in the history
* Pin Bazel version to 5.4.0

* Disable failing tests due to infra change

* Add .bazelversion

* Disable more tests on mac
  • Loading branch information
meteorcloudy authored Apr 5, 2023
1 parent 312fcab commit 0c4e292
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 1 deletion.
21 changes: 21 additions & 0 deletions .bazelci/postsubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ tasks:
- "//tools/python/..."
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
- "-//src/java_tools/import_deps_checker/..."
# Disable test failing due to infra change
- "-//src/test/shell/bazel:git_repository_test"
- "-//src/test/shell/bazel:starlark_git_repository_test"
include_json_profile:
- build
- test
Expand Down Expand Up @@ -146,6 +149,9 @@ tasks:
- "//tools/python/..."
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
- "-//src/java_tools/import_deps_checker/..."
# Disable test failing due to infra change
- "-//src/test/shell/bazel:git_repository_test"
- "-//src/test/shell/bazel:starlark_git_repository_test"
include_json_profile:
- build
- test
Expand Down Expand Up @@ -185,6 +191,18 @@ tasks:
- "//tools/python/..."
# C++ coverage is not supported on macOS yet.
- "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
# Disable test failing due to infra change
- "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:GitRepositoryBlackBoxTest"
- "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:PatchApiBlackBoxTest"
- "-//tools/python:pywrapper_test"
- "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test_with_head_android_tools"
- "-//src/test/py/bazel:runfiles_test"
- "-//src/test/shell/bazel:jdeps_test"
- "-//src/test/shell/bazel:python_version_test"
- "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test"
- "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test_with_platforms"
- "-//src/test/shell/bazel:git_repository_test"
- "-//src/test/shell/bazel:starlark_git_repository_test"
include_json_profile:
- build
- test
Expand Down Expand Up @@ -249,6 +267,9 @@ tasks:
- "-//src/test/java/com/google/devtools/build/lib/remote/..."
- "-//src/test/shell/bazel/remote/..."
- "-//tools/python:pywrapper_test"
# Disable test failing due to infra change
- "-//src/test/shell/bazel:git_repository_test"
- "-//src/test/shell/bazel:starlark_git_repository_test"
include_json_profile:
- build
- test
Expand Down
21 changes: 21 additions & 0 deletions .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ tasks:
- "//tools/python/..."
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
- "-//src/java_tools/import_deps_checker/..."
# Disable test failing due to infra change
- "-//src/test/shell/bazel:git_repository_test"
- "-//src/test/shell/bazel:starlark_git_repository_test"
ubuntu1804_clang:
platform: ubuntu1804
environment:
Expand Down Expand Up @@ -143,6 +146,9 @@ tasks:
- "//tools/python/..."
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
- "-//src/java_tools/import_deps_checker/..."
# Disable test failing due to infra change
- "-//src/test/shell/bazel:git_repository_test"
- "-//src/test/shell/bazel:starlark_git_repository_test"
macos:
xcode_version: "13.0"
shards: 5
Expand Down Expand Up @@ -184,6 +190,18 @@ tasks:
- "-//src/java_tools/import_deps_checker/..."
# C++ coverage is not supported on macOS yet.
- "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
# Disable test failing due to infra change
- "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:GitRepositoryBlackBoxTest"
- "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:PatchApiBlackBoxTest"
- "-//tools/python:pywrapper_test"
- "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test_with_head_android_tools"
- "-//src/test/py/bazel:runfiles_test"
- "-//src/test/shell/bazel:jdeps_test"
- "-//src/test/shell/bazel:python_version_test"
- "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test"
- "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test_with_platforms"
- "-//src/test/shell/bazel:git_repository_test"
- "-//src/test/shell/bazel:starlark_git_repository_test"
windows:
shards: 4
batch_commands:
Expand Down Expand Up @@ -247,6 +265,9 @@ tasks:
- "-//src/test/java/com/google/devtools/build/lib/remote/..."
- "-//src/test/shell/bazel/remote/..."
- "-//tools/python:pywrapper_test"
# Disable test failing due to infra change
- "-//src/test/shell/bazel:git_repository_test"
- "-//src/test/shell/bazel:starlark_git_repository_test"
rbe_ubuntu1804:
platform: ubuntu1804
shell_commands:
Expand Down
1 change: 1 addition & 0 deletions .bazelversion
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5.4.0
2 changes: 1 addition & 1 deletion BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ filegroup(
"//tools:srcs",
"//third_party:srcs",
"//src/main/starlark/tests/builtins_bzl:srcs",
] + glob([".bazelci/*"]) + [".bazelrc"],
] + glob([".bazelci/*"]) + [".bazelrc", ".bazelversion"],
visibility = ["//src/test/shell/bazel:__pkg__"],
)

Expand Down

0 comments on commit 0c4e292

Please sign in to comment.