Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[4.2.4]Bump minimum supported macOS versions to 10.13 #18044

Closed
wants to merge 6 commits into from
Closed

[4.2.4]Bump minimum supported macOS versions to 10.13 #18044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9ab3aba
Bump minimum supported macOS versions to 10.13
illicitonion Feb 22, 2023
f2f1c16
Revert section
keertk Apr 11, 2023
5e53cef
Fix line
keertk Apr 11, 2023
48120e8
Disable postsubmit tests
keertk Apr 11, 2023
40bc7ce
Disable presubmit tests
keertk Apr 11, 2023
824606b
Fix
keertk Apr 11, 2023
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
12 changes: 12 additions & 0 deletions .bazelci/postsubmit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,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 @@ -199,6 +202,9 @@ tasks:
- "-//src/test/shell/bazel/android:android_ndk_integration_test"
- "-//src/test/shell/bazel:bazel_coverage_cc_head_test_gcc"
- "-//src/test/shell/bazel/android:android_ndk_integration_test_with_head_android_tools"
# 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 @@ -239,6 +245,9 @@ 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/shell/bazel:git_repository_test"
- "-//src/test/shell/bazel:starlark_git_repository_test"
include_json_profile:
- build
- test
Expand All @@ -265,6 +274,9 @@ tasks:
- "--test_env=TEST_REPOSITORY_HOME=$OUTPUT_BASE/external"
test_targets:
- "//src:all_windows_tests"
# 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
12 changes: 12 additions & 0 deletions .bazelci/presubmit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,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 @@ -191,6 +194,9 @@ tasks:
- "-//src/test/shell/bazel/android:android_ndk_integration_test"
- "-//src/test/shell/bazel:bazel_coverage_cc_head_test_gcc"
- "-//src/test/shell/bazel/android:android_ndk_integration_test_with_head_android_tools"
# Disable test failing due to infra change
- "-//src/test/shell/bazel:git_repository_test"
- "-//src/test/shell/bazel:starlark_git_repository_test"
macos:
environment:
USE_BAZEL_VERSION: 4.2.2
Expand Down Expand Up @@ -232,6 +238,9 @@ 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/shell/bazel:git_repository_test"
- "-//src/test/shell/bazel:starlark_git_repository_test"
windows:
environment:
USE_BAZEL_VERSION: 4.2.2
Expand All @@ -256,6 +265,9 @@ tasks:
- "--test_env=TEST_REPOSITORY_HOME=$OUTPUT_BASE/external"
test_targets:
- "//src:all_windows_tests"
# Disable test failing due to infra change
- "-//src/test/shell/bazel:git_repository_test"
- "-//src/test/shell/bazel:starlark_git_repository_test"
rbe_ubuntu1604:
environment:
USE_BAZEL_VERSION: 4.2.2
Expand Down
2 changes: 1 addition & 1 deletion scripts/bootstrap/compile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ cp $OUTPUT_DIR/libblaze.jar ${ARCHIVE_DIR}
# TODO(b/28965185): Remove when xcode-locator is no longer required in embedded_binaries.
log "Compiling xcode-locator..."
if [[ $PLATFORM == "darwin" ]]; then
run /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -fobjc-arc -framework CoreServices -framework Foundation -o ${ARCHIVE_DIR}/xcode-locator tools/osx/xcode_locator.m
run /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices -framework Foundation -o ${ARCHIVE_DIR}/xcode-locator tools/osx/xcode_locator.m
else
cp tools/osx/xcode_locator_stub.sh ${ARCHIVE_DIR}/xcode-locator
fi
Expand Down
2 changes: 1 addition & 1 deletion tools/cpp/osx_cc_configure.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def _compile_cc_file(repository_ctx, src_name, out_name):
"--sdk",
"macosx",
"clang",
"-mmacosx-version-min=10.9",
"-mmacosx-version-min=10.13",
"-std=c++11",
"-lc++",
"-O3",
Expand Down
2 changes: 1 addition & 1 deletion tools/osx/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ exports_files([
])

DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """
/usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -fobjc-arc -framework CoreServices \
/usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices \
-framework Foundation -o $@ $<
"""

Expand Down
2 changes: 1 addition & 1 deletion tools/osx/xcode_configure.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ def run_xcode_locator(repository_ctx, xcode_locator_src_label):
"--sdk",
"macosx",
"clang",
"-mmacosx-version-min=10.9",
"-mmacosx-version-min=10.13",
"-fobjc-arc",
"-framework",
"CoreServices",
Expand Down