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.

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

Revert "chore: build verifier_test deps in the exec configuration" #6112

Merged
merged 1 commit into from
Apr 22, 2024

Conversation

salguarnieri
Copy link
Contributor

Reverts #6110

@salguarnieri salguarnieri requested review from shahms and a team April 22, 2024 16:17
@salguarnieri salguarnieri enabled auto-merge (squash) April 22, 2024 16:17
@shahms
Copy link
Contributor

shahms commented Apr 22, 2024

Thanks; I think the underlying issue can be fixed by doing the same thing for tools as for the indexer attibute:

--- a/tools/build_rules/verifier_test/java_verifier_test.bzl  2024-04-15 09:45:33.000000000 -0700
+++ b/tools/build_rules/verifier_test/java_verifier_test.bzl     2024-04-22 09:24:32.000000000 -0700
@@ -212,6 +212,7 @@
         opts = indexer_opts,
         tags = tags + ["manual"],
         tools = tools,
+        target_tools = tools,
         visibility = visibility,
         deps = [kzip],
     )
--- a/tools/build_rules/verifier_test/verifier_test.bzl       2024-01-19 14:26:39.000000000 -0800
+++ b/tools/build_rules/verifier_test/verifier_test.bzl  2024-04-22 09:25:50.000000000 -0700
@@ -241,7 +241,7 @@
             KytheEntryProducerInfo(
                 executables = test_runners,
                 runfiles = ctx.runfiles(
-                    files = (test_runners + kzips + ctx.files.tools),
+                    files = (test_runners + kzips + ctx.files.target_tools),
                 ).merge(ctx.attr.target_indexer[DefaultInfo].default_runfiles),
             ),
         )
@@ -287,6 +287,9 @@
             cfg = "exec",
             allow_files = True,
         ),
+        "target_tools": attr.label_list(
+            allow_files = True,
+        ),
         "deps": attr.label_list(
             mandatory = True,
             allow_empty = False,

@salguarnieri salguarnieri merged commit 5a3525f into master Apr 22, 2024
10 checks passed
@shahms shahms deleted the revert-6110-j branch April 22, 2024 16:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants