Skip to content

Commit 3ed0cbb

Browse files
vihangmzasgar
authored andcommitted
Replace rules_meta with with_cfg (#2006)
Summary: rules_meta relies on the name parameter for rules which is removed in bazel7. So this switches us over to it's replacement which is with_cfg.bzl For more info see fmeum/rules_meta#1 Relevant Issues: N/A Type of change: /kind infra Test Plan: Multiarch images still build. Signed-off-by: Vihang Mehta <[email protected]> GitOrigin-RevId: 742d9f8479883ec9ca224f4565dd3571d993e530
1 parent 3a3d86f commit 3ed0cbb

File tree

5 files changed

+20
-24
lines changed

5 files changed

+20
-24
lines changed

MODULE.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ bazel_dep(name = "rules_foreign_cc", version = "0.10.1")
3232
bazel_dep(name = "rules_python", version = "0.27.1")
3333
bazel_dep(name = "rules_oci", version = "1.4.3")
3434
bazel_dep(name = "rules_python_gazelle_plugin", version = "0.27.1")
35+
bazel_dep(name = "with_cfg.bzl", version = "0.2.1")
3536
bazel_dep(name = "glog", version = "0.6.0", repo_name = "com_github_google_glog")
3637
bazel_dep(name = "abseil-cpp", version = "20230802.0", repo_name = "com_google_absl")
3738
bazel_dep(name = "googletest", version = "1.14.0", repo_name = "com_google_googletest")

bazel/cc_toolchains/BUILD.bazel

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ load("//bazel/cc_toolchains:gcc.bzl", "gcc_x86_64_gnu")
1818
load("//bazel/cc_toolchains:llvm_libs.bzl", "llvm_variant_settings")
1919
load("//bazel/cc_toolchains:settings.bzl", "settings")
2020

21+
package(
22+
default_visibility = ["//visibility:public"],
23+
)
24+
2125
filegroup(
2226
name = "empty",
2327
)

bazel/repositories.bzl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,6 @@ def _gml_cc_toolchain_deps():
239239

240240
def _gml_deps():
241241
_bazel_repo("bazel_skylib")
242-
_bazel_repo("com_github_fmeum_rules_meta")
243-
244242
_bazel_repo(
245243
"com_github_benchsci_rules_nodejs_gazelle",
246244
patches = [

bazel/repository_locations.bzl

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,6 @@ REPOSITORY_LOCATIONS = dict(
3535
"https://github.com/benchsci/rules_nodejs_gazelle/archive/refs/tags/v0.4.1.tar.gz",
3636
],
3737
),
38-
com_github_fmeum_rules_meta = dict(
39-
sha256 = "ed3ed909e6e3f34a11d7c2adcc461535975a875fe434719540a4e6f63434a866",
40-
strip_prefix = "rules_meta-0.0.4",
41-
urls = [
42-
"https://github.com/fmeum/rules_meta/archive/refs/tags/v0.0.4.tar.gz",
43-
],
44-
),
4538
com_github_gflags_gflags = dict(
4639
sha256 = "9e1a38e2dcbb20bb10891b5a171de2e5da70e0a50fff34dd4b0c2c6d75043909",
4740
strip_prefix = "gflags-524b83d0264cb9f1b2d134c564ef1aa23f207a41",

bazel/toolchain_transitions.bzl

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@
1313
#
1414
# SPDX-License-Identifier: Proprietary
1515

16-
load("@com_github_fmeum_rules_meta//meta:defs.bzl", "meta")
1716
load("@rules_oci//oci:defs.bzl", "oci_image")
17+
load("@with_cfg.bzl", "with_cfg")
1818

19-
oci_image_x86_64 = meta.wrap_with_transition(
20-
oci_image,
21-
{
22-
"//command_line_option:platforms": meta.replace_with("@//bazel/cc_toolchains:linux-x86_64"),
23-
"@//bazel/cc_toolchains:libc_version": meta.replace_with("glibc2_36"),
24-
},
25-
)
19+
oci_image_x86_64, _oci_image_x86_64_internal = with_cfg(oci_image).set(
20+
"platforms",
21+
[Label("@//bazel/cc_toolchains:linux-x86_64")],
22+
).set(
23+
Label("@//bazel/cc_toolchains:libc_version"),
24+
"glibc2_36",
25+
).build()
2626

27-
oci_image_arm64 = meta.wrap_with_transition(
28-
oci_image,
29-
{
30-
"//command_line_option:platforms": meta.replace_with("@//bazel/cc_toolchains:linux-aarch64"),
31-
"@//bazel/cc_toolchains:libc_version": meta.replace_with("glibc2_36"),
32-
},
33-
)
27+
oci_image_arm64, _oci_image_arm64_internal = with_cfg(oci_image).set(
28+
"platforms",
29+
[Label("@//bazel/cc_toolchains:linux-aarch64")],
30+
).set(
31+
Label("@//bazel/cc_toolchains:libc_version"),
32+
"glibc2_36",
33+
).build()

0 commit comments

Comments
 (0)