Skip to content

Commit 4b80c8c

Browse files
authored
Merge branch 'release-6.2.0' into cherry-pick-17351
2 parents 30aa5c1 + 2c1a63b commit 4b80c8c

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

.bazelci/postsubmit.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ tasks:
158158
- build
159159
- test
160160
macos:
161-
xcode_version: "13.0"
161+
xcode_version: "14.2"
162162
shell_commands:
163163
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
164164
android_ndk_repository/android_ndk_repository/' WORKSPACE
@@ -214,6 +214,12 @@ tasks:
214214
- "-//src/test/java/com/google/devtools/build/lib/platform:SystemMemoryPressureEventTest"
215215
# https://github.com/bazelbuild/bazel/issues/17411
216216
- "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:PatchApiBlackBoxTest"
217+
# https://github.com/bazelbuild/bazel/issues/17447
218+
- "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:GitRepositoryBlackBoxTest"
219+
# https://github.com/bazelbuild/bazel/issues/17456
220+
- "-//src/test/shell/bazel:bazel_determinism_test"
221+
# https://github.com/bazelbuild/bazel/issues/17457
222+
- "-//src/test/shell/bazel:jdeps_test"
217223
include_json_profile:
218224
- build
219225
- test

.bazelci/presubmit.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ tasks:
148148
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
149149
- "-//src/java_tools/import_deps_checker/..."
150150
macos:
151-
xcode_version: "13.0"
151+
xcode_version: "14.2"
152152
shards: 5
153153
shell_commands:
154154
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -207,6 +207,12 @@ tasks:
207207
- "-//src/test/java/com/google/devtools/build/lib/platform:SystemMemoryPressureEventTest"
208208
# https://github.com/bazelbuild/bazel/issues/17411
209209
- "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:PatchApiBlackBoxTest"
210+
# https://github.com/bazelbuild/bazel/issues/17447
211+
- "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:GitRepositoryBlackBoxTest"
212+
# https://github.com/bazelbuild/bazel/issues/17456
213+
- "-//src/test/shell/bazel:bazel_determinism_test"
214+
# https://github.com/bazelbuild/bazel/issues/17457
215+
- "-//src/test/shell/bazel:jdeps_test"
210216
windows:
211217
shards: 4
212218
batch_commands:

0 commit comments

Comments
 (0)