Extend cc_{binary,test} if supported (#154)

fmeum · Jan 25, 2025 · bf2bd54 · bf2bd54
1 parent b8e3c88
commit bf2bd54
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -25,14 +25,14 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04, macos-14, windows-2022]
-        bazelversion: [6.5.0, 7.4.1, latest, last_green]
+        bazelversion: [6.x, 7.x, 8.x, last_green]
         folder: [examples]
         include:
           - os: ubuntu-22.04
-            bazelversion: latest
+            bazelversion: 8.x
             folder: "."
           - os: windows-2022
-            bazelversion: 6.5.0
+            bazelversion: 6.x
             test_args: "-- -//sh:test -//args_location_expansion:doubly_transitioned_test"
 
     steps:

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -4,7 +4,7 @@ module(
     compatibility_level = 1,
 )
 
-bazel_dep(name = "bazel_features", version = "1.22.0")
+bazel_dep(name = "bazel_features", version = "1.24.0")
 bazel_dep(name = "bazel_skylib", version = "1.4.1")
 bazel_dep(name = "platforms", version = "0.0.6")
 

diff --git a/with_cfg/private/with_cfg.bzl b/with_cfg/private/with_cfg.bzl
@@ -1,3 +1,4 @@
+load("@bazel_features//:features.bzl", "bazel_features")
 load(":builder.bzl", "make_builder")
 load(":providers.bzl", "RuleInfo")
 load(":rule_defaults.bzl", "DEFAULT_PROVIDERS", "IMPLICIT_TARGETS", "SPECIAL_CASED_PROVIDERS")
@@ -166,7 +167,7 @@ _NOT_EXTENDABLE = [
     # keep sorted
     "cc_binary",
     "cc_test",
-]
+] if not bazel_features.cc.rules_support_extension else []
 
 def _supports_extension(kind):
     kind_str = str(kind)