Skip to content

fix: correct uses of target_compatible_with #8257

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

Merged
coryan merged 4 commits into from
Feb 5, 2022
Merged

fix: correct uses of target_compatible_with #8257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60805ba
fix: correct uses of `target_compatible_with`
coryan Feb 5, 2022
63eebd7
Use latest platforms package
coryan Feb 5, 2022
ad14201
Also disable google/cloud/channel for Windows
coryan Feb 5, 2022
2daac2a
Also disable asset for windows
coryan Feb 5, 2022
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
11 changes: 11 additions & 0 deletions bazel/google_cloud_cpp_deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,17 @@ def google_cloud_cpp_deps():
override the version of the dependencies they want to use.
"""

# Load platforms, we use it directly
if "platforms" not in native.existing_rules():
http_archive(
name = "platforms",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz",
"https://github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz",
],
sha256 = "079945598e4b6cc075846f7fd6a9d0857c33a7afc0de868c2ccb96405225135d",
)

# Load rules_cc, used by googletest
if "rules_cc" not in native.existing_rules():
http_archive(
Expand Down
16 changes: 6 additions & 10 deletions google/cloud/asset/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,12 @@ cc_library(
include = [HEADER_GLOB],
exclude = [MOCK_HEADER_GLOB],
),
# TODO(8145): Enable on macOS.
target_compatible_with = [
"@platforms//os:linux",
"@platforms//os:windows",
],
# TODO(#8145): Enable on macOS and windows.
target_compatible_with = select({
"@platforms//os:macos": ["@platforms//:incompatible"],
"@platforms//os:windows": ["@platforms//:incompatible"],
"//conditions:default": [],
}),
visibility = ["//:__pkg__"],
deps = [
"//google/cloud:google_cloud_cpp_common",
Expand All @@ -55,11 +56,6 @@ cc_library(
hdrs = glob(
include = [MOCK_HEADER_GLOB],
),
# TODO(8145): Enable on macOS.
target_compatible_with = [
"@platforms//os:linux",
"@platforms//os:windows",
],
visibility = ["//:__pkg__"],
deps = [
":google_cloud_cpp_asset",
Expand Down
10 changes: 5 additions & 5 deletions google/cloud/assuredworkloads/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ cc_library(
include = [HEADER_GLOB],
exclude = [MOCK_HEADER_GLOB],
),
# TODO(#8198): Re-enable the macos build.
target_compatible_with = [
"@platforms//os:linux",
"@platforms//os:macos",
],
# TODO(#8198): Re-enable the Windows build.
target_compatible_with = select({
"@platforms//os:windows": ["@platforms//:incompatible"],
"//conditions:default": [],
}),
visibility = ["//:__pkg__"],
deps = [
"//google/cloud:google_cloud_cpp_common",
Expand Down
11 changes: 6 additions & 5 deletions google/cloud/channel/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,12 @@ cc_library(
include = [HEADER_GLOB],
exclude = [MOCK_HEADER_GLOB],
),
# TODO(8125): Re-enable the macos build.
target_compatible_with = [
"@platforms//os:linux",
"@platforms//os:windows",
],
# TODO(#8125): Re-enable the macos and Windows builds.
target_compatible_with = select({
"@platforms//os:macos": ["@platforms//:incompatible"],
"@platforms//os:windows": ["@platforms//:incompatible"],
"//conditions:default": [],
}),
visibility = ["//:__pkg__"],
deps = [
"//google/cloud:google_cloud_cpp_common",
Expand Down