Skip to content

Commit 68c1fe3

Browse files
coryancoryan
authored
feat: simplify Bazel initialization (#13411)
In v2.20.0 we introduced new Bazel WORKSPACE functions that should simplify the transition to Bazel v7. Now that the quickstart directories are using v2.20.0, we can change them to use these functions.
1 parent 540a160 commit 68c1fe3

131 files changed

Lines changed: 2096 additions & 1834 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ci/verify_current_targets/WORKSPACE.bazel‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,26 @@ local_repository(
2222
path = "../../",
2323
)
2424

25-
# Load indirect dependencies due to
26-
# https://github.com/bazelbuild/bazel/issues/1943
27-
load("@google_cloud_cpp//bazel:google_cloud_cpp_deps.bzl", "google_cloud_cpp_deps")
25+
load("@google_cloud_cpp//bazel:workspace0.bzl", "gl_cpp_workspace0")
2826

29-
google_cloud_cpp_deps()
27+
gl_cpp_workspace0()
3028

31-
load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
29+
load("@google_cloud_cpp//bazel:workspace1.bzl", "gl_cpp_workspace1")
3230

33-
switched_rules_by_language(
34-
name = "com_google_googleapis_imports",
35-
cc = True,
36-
grpc = True,
37-
)
31+
gl_cpp_workspace1()
32+
33+
load("@google_cloud_cpp//bazel:workspace2.bzl", "gl_cpp_workspace2")
34+
35+
gl_cpp_workspace2()
36+
37+
load("@google_cloud_cpp//bazel:workspace3.bzl", "gl_cpp_workspace3")
38+
39+
gl_cpp_workspace3()
3840

39-
load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
41+
load("@google_cloud_cpp//bazel:workspace4.bzl", "gl_cpp_workspace4")
4042

41-
grpc_deps()
43+
gl_cpp_workspace4()
4244

43-
load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
45+
load("@google_cloud_cpp//bazel:workspace5.bzl", "gl_cpp_workspace5")
4446

45-
grpc_extra_deps()
47+
gl_cpp_workspace5()

‎ci/verify_deprecated_targets/WORKSPACE.bazel‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,26 @@ local_repository(
2424
path = "../../",
2525
)
2626

27-
# Load indirect dependencies due to
28-
# https://github.com/bazelbuild/bazel/issues/1943
29-
load("@google_cloud_cpp//bazel:google_cloud_cpp_deps.bzl", "google_cloud_cpp_deps")
27+
load("@google_cloud_cpp//bazel:workspace0.bzl", "gl_cpp_workspace0")
3028

31-
google_cloud_cpp_deps()
29+
gl_cpp_workspace0()
3230

33-
load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
31+
load("@google_cloud_cpp//bazel:workspace1.bzl", "gl_cpp_workspace1")
3432

35-
switched_rules_by_language(
36-
name = "com_google_googleapis_imports",
37-
cc = True,
38-
grpc = True,
39-
)
33+
gl_cpp_workspace1()
34+
35+
load("@google_cloud_cpp//bazel:workspace2.bzl", "gl_cpp_workspace2")
36+
37+
gl_cpp_workspace2()
38+
39+
load("@google_cloud_cpp//bazel:workspace3.bzl", "gl_cpp_workspace3")
40+
41+
gl_cpp_workspace3()
4042

41-
load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
43+
load("@google_cloud_cpp//bazel:workspace4.bzl", "gl_cpp_workspace4")
4244

43-
grpc_deps()
45+
gl_cpp_workspace4()
4446

45-
load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
47+
load("@google_cloud_cpp//bazel:workspace5.bzl", "gl_cpp_workspace5")
4648

47-
grpc_extra_deps()
49+
gl_cpp_workspace5()

‎generator/templates/WORKSPACE.bazel‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,26 @@ http_archive(
2828
url = "https://github.com/googleapis/google-cloud-cpp/archive/v2.20.0.tar.gz",
2929
)
3030

31-
# Load indirect dependencies due to
32-
# https://github.com/bazelbuild/bazel/issues/1943
33-
load("@google_cloud_cpp//bazel:google_cloud_cpp_deps.bzl", "google_cloud_cpp_deps")
31+
load("@google_cloud_cpp//bazel:workspace0.bzl", "gl_cpp_workspace0")
3432

35-
google_cloud_cpp_deps()
33+
gl_cpp_workspace0()
3634

37-
load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
35+
load("@google_cloud_cpp//bazel:workspace1.bzl", "gl_cpp_workspace1")
3836

39-
switched_rules_by_language(
40-
name = "com_google_googleapis_imports",
41-
cc = True,
42-
grpc = True,
43-
)
37+
gl_cpp_workspace1()
38+
39+
load("@google_cloud_cpp//bazel:workspace2.bzl", "gl_cpp_workspace2")
40+
41+
gl_cpp_workspace2()
42+
43+
load("@google_cloud_cpp//bazel:workspace3.bzl", "gl_cpp_workspace3")
44+
45+
gl_cpp_workspace3()
4446

45-
load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
47+
load("@google_cloud_cpp//bazel:workspace4.bzl", "gl_cpp_workspace4")
4648

47-
grpc_deps()
49+
gl_cpp_workspace4()
4850

49-
load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
51+
load("@google_cloud_cpp//bazel:workspace5.bzl", "gl_cpp_workspace5")
5052

51-
grpc_extra_deps()
53+
gl_cpp_workspace5()

‎google/cloud/accessapproval/quickstart/WORKSPACE.bazel‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,26 @@ http_archive(
2828
url = "https://github.com/googleapis/google-cloud-cpp/archive/v2.20.0.tar.gz",
2929
)
3030

31-
# Load indirect dependencies due to
32-
# https://github.com/bazelbuild/bazel/issues/1943
33-
load("@google_cloud_cpp//bazel:google_cloud_cpp_deps.bzl", "google_cloud_cpp_deps")
31+
load("@google_cloud_cpp//bazel:workspace0.bzl", "gl_cpp_workspace0")
3432

35-
google_cloud_cpp_deps()
33+
gl_cpp_workspace0()
3634

37-
load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
35+
load("@google_cloud_cpp//bazel:workspace1.bzl", "gl_cpp_workspace1")
3836

39-
switched_rules_by_language(
40-
name = "com_google_googleapis_imports",
41-
cc = True,
42-
grpc = True,
43-
)
37+
gl_cpp_workspace1()
38+
39+
load("@google_cloud_cpp//bazel:workspace2.bzl", "gl_cpp_workspace2")
40+
41+
gl_cpp_workspace2()
42+
43+
load("@google_cloud_cpp//bazel:workspace3.bzl", "gl_cpp_workspace3")
44+
45+
gl_cpp_workspace3()
4446

45-
load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
47+
load("@google_cloud_cpp//bazel:workspace4.bzl", "gl_cpp_workspace4")
4648

47-
grpc_deps()
49+
gl_cpp_workspace4()
4850

49-
load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
51+
load("@google_cloud_cpp//bazel:workspace5.bzl", "gl_cpp_workspace5")
5052

51-
grpc_extra_deps()
53+
gl_cpp_workspace5()

‎google/cloud/accesscontextmanager/quickstart/WORKSPACE.bazel‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,26 @@ http_archive(
2828
url = "https://github.com/googleapis/google-cloud-cpp/archive/v2.20.0.tar.gz",
2929
)
3030

31-
# Load indirect dependencies due to
32-
# https://github.com/bazelbuild/bazel/issues/1943
33-
load("@google_cloud_cpp//bazel:google_cloud_cpp_deps.bzl", "google_cloud_cpp_deps")
31+
load("@google_cloud_cpp//bazel:workspace0.bzl", "gl_cpp_workspace0")
3432

35-
google_cloud_cpp_deps()
33+
gl_cpp_workspace0()
3634

37-
load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
35+
load("@google_cloud_cpp//bazel:workspace1.bzl", "gl_cpp_workspace1")
3836

39-
switched_rules_by_language(
40-
name = "com_google_googleapis_imports",
41-
cc = True,
42-
grpc = True,
43-
)
37+
gl_cpp_workspace1()
38+
39+
load("@google_cloud_cpp//bazel:workspace2.bzl", "gl_cpp_workspace2")
40+
41+
gl_cpp_workspace2()
42+
43+
load("@google_cloud_cpp//bazel:workspace3.bzl", "gl_cpp_workspace3")
44+
45+
gl_cpp_workspace3()
4446

45-
load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
47+
load("@google_cloud_cpp//bazel:workspace4.bzl", "gl_cpp_workspace4")
4648

47-
grpc_deps()
49+
gl_cpp_workspace4()
4850

49-
load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
51+
load("@google_cloud_cpp//bazel:workspace5.bzl", "gl_cpp_workspace5")
5052

51-
grpc_extra_deps()
53+
gl_cpp_workspace5()

‎google/cloud/advisorynotifications/quickstart/WORKSPACE.bazel‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,26 @@ http_archive(
2828
url = "https://github.com/googleapis/google-cloud-cpp/archive/v2.20.0.tar.gz",
2929
)
3030

31-
# Load indirect dependencies due to
32-
# https://github.com/bazelbuild/bazel/issues/1943
33-
load("@google_cloud_cpp//bazel:google_cloud_cpp_deps.bzl", "google_cloud_cpp_deps")
31+
load("@google_cloud_cpp//bazel:workspace0.bzl", "gl_cpp_workspace0")
3432

35-
google_cloud_cpp_deps()
33+
gl_cpp_workspace0()
3634

37-
load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
35+
load("@google_cloud_cpp//bazel:workspace1.bzl", "gl_cpp_workspace1")
3836

39-
switched_rules_by_language(
40-
name = "com_google_googleapis_imports",
41-
cc = True,
42-
grpc = True,
43-
)
37+
gl_cpp_workspace1()
38+
39+
load("@google_cloud_cpp//bazel:workspace2.bzl", "gl_cpp_workspace2")
40+
41+
gl_cpp_workspace2()
42+
43+
load("@google_cloud_cpp//bazel:workspace3.bzl", "gl_cpp_workspace3")
44+
45+
gl_cpp_workspace3()
4446

45-
load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
47+
load("@google_cloud_cpp//bazel:workspace4.bzl", "gl_cpp_workspace4")
4648

47-
grpc_deps()
49+
gl_cpp_workspace4()
4850

49-
load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
51+
load("@google_cloud_cpp//bazel:workspace5.bzl", "gl_cpp_workspace5")
5052

51-
grpc_extra_deps()
53+
gl_cpp_workspace5()

‎google/cloud/aiplatform/quickstart/WORKSPACE.bazel‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,26 @@ http_archive(
2828
url = "https://github.com/googleapis/google-cloud-cpp/archive/v2.20.0.tar.gz",
2929
)
3030

31-
# Load indirect dependencies due to
32-
# https://github.com/bazelbuild/bazel/issues/1943
33-
load("@google_cloud_cpp//bazel:google_cloud_cpp_deps.bzl", "google_cloud_cpp_deps")
31+
load("@google_cloud_cpp//bazel:workspace0.bzl", "gl_cpp_workspace0")
3432

35-
google_cloud_cpp_deps()
33+
gl_cpp_workspace0()
3634

37-
load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
35+
load("@google_cloud_cpp//bazel:workspace1.bzl", "gl_cpp_workspace1")
3836

39-
switched_rules_by_language(
40-
name = "com_google_googleapis_imports",
41-
cc = True,
42-
grpc = True,
43-
)
37+
gl_cpp_workspace1()
38+
39+
load("@google_cloud_cpp//bazel:workspace2.bzl", "gl_cpp_workspace2")
40+
41+
gl_cpp_workspace2()
42+
43+
load("@google_cloud_cpp//bazel:workspace3.bzl", "gl_cpp_workspace3")
44+
45+
gl_cpp_workspace3()
4446

45-
load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
47+
load("@google_cloud_cpp//bazel:workspace4.bzl", "gl_cpp_workspace4")
4648

47-
grpc_deps()
49+
gl_cpp_workspace4()
4850

49-
load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
51+
load("@google_cloud_cpp//bazel:workspace5.bzl", "gl_cpp_workspace5")
5052

51-
grpc_extra_deps()
53+
gl_cpp_workspace5()

‎google/cloud/alloydb/quickstart/WORKSPACE.bazel‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,26 @@ http_archive(
2828
url = "https://github.com/googleapis/google-cloud-cpp/archive/v2.20.0.tar.gz",
2929
)
3030

31-
# Load indirect dependencies due to
32-
# https://github.com/bazelbuild/bazel/issues/1943
33-
load("@google_cloud_cpp//bazel:google_cloud_cpp_deps.bzl", "google_cloud_cpp_deps")
31+
load("@google_cloud_cpp//bazel:workspace0.bzl", "gl_cpp_workspace0")
3432

35-
google_cloud_cpp_deps()
33+
gl_cpp_workspace0()
3634

37-
load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
35+
load("@google_cloud_cpp//bazel:workspace1.bzl", "gl_cpp_workspace1")
3836

39-
switched_rules_by_language(
40-
name = "com_google_googleapis_imports",
41-
cc = True,
42-
grpc = True,
43-
)
37+
gl_cpp_workspace1()
38+
39+
load("@google_cloud_cpp//bazel:workspace2.bzl", "gl_cpp_workspace2")
40+
41+
gl_cpp_workspace2()
42+
43+
load("@google_cloud_cpp//bazel:workspace3.bzl", "gl_cpp_workspace3")
44+
45+
gl_cpp_workspace3()
4446

45-
load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
47+
load("@google_cloud_cpp//bazel:workspace4.bzl", "gl_cpp_workspace4")
4648

47-
grpc_deps()
49+
gl_cpp_workspace4()
4850

49-
load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
51+
load("@google_cloud_cpp//bazel:workspace5.bzl", "gl_cpp_workspace5")
5052

51-
grpc_extra_deps()
53+
gl_cpp_workspace5()

‎google/cloud/apigateway/quickstart/WORKSPACE.bazel‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,26 @@ http_archive(
2828
url = "https://github.com/googleapis/google-cloud-cpp/archive/v2.20.0.tar.gz",
2929
)
3030

31-
# Load indirect dependencies due to
32-
# https://github.com/bazelbuild/bazel/issues/1943
33-
load("@google_cloud_cpp//bazel:google_cloud_cpp_deps.bzl", "google_cloud_cpp_deps")
31+
load("@google_cloud_cpp//bazel:workspace0.bzl", "gl_cpp_workspace0")
3432

35-
google_cloud_cpp_deps()
33+
gl_cpp_workspace0()
3634

37-
load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
35+
load("@google_cloud_cpp//bazel:workspace1.bzl", "gl_cpp_workspace1")
3836

39-
switched_rules_by_language(
40-
name = "com_google_googleapis_imports",
41-
cc = True,
42-
grpc = True,
43-
)
37+
gl_cpp_workspace1()
38+
39+
load("@google_cloud_cpp//bazel:workspace2.bzl", "gl_cpp_workspace2")
40+
41+
gl_cpp_workspace2()
42+
43+
load("@google_cloud_cpp//bazel:workspace3.bzl", "gl_cpp_workspace3")
44+
45+
gl_cpp_workspace3()
4446

45-
load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
47+
load("@google_cloud_cpp//bazel:workspace4.bzl", "gl_cpp_workspace4")
4648

47-
grpc_deps()
49+
gl_cpp_workspace4()
4850

49-
load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
51+
load("@google_cloud_cpp//bazel:workspace5.bzl", "gl_cpp_workspace5")
5052

51-
grpc_extra_deps()
53+
gl_cpp_workspace5()

0 commit comments

Comments
 (0)