From c2ac9318676487938ca91aaec5392908ca60c553 Mon Sep 17 00:00:00 2001
From: Nils Wireklint <Nils.Wireklint@NiraDynamics.se>
Date: Wed, 7 Feb 2024 16:37:08 +0100
Subject: [PATCH] Explicitly request query label output

To work with users who prefer a different output in their personal rc
file. Using '--nohome_rc' is not good either, if they want to change the
output base this query would duplicate a lot of data.
---
 .github/workflows/master.yaml                       | 2 +-
 .github/workflows/pull-requests.yaml                | 2 +-
 tools/github_workflows/workflows_template.libsonnet | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
index cc9c8056..cbb00586 100644
--- a/.github/workflows/master.yaml
+++ b/.github/workflows/master.yaml
@@ -41,7 +41,7 @@
             },
             {
                "name": "Protobuf generation",
-               "run": "find . bazel-bin/pkg/proto -name '*.pb.go' -delete || true\nbazel build $(bazel query 'kind(\"go_proto_library\", //...)')\nfind bazel-bin/pkg/proto -name '*.pb.go' | while read f; do\n  cat $f > $(echo $f | sed -e 's|.*/pkg/proto/|pkg/proto/|')\ndone\n"
+               "run": "find . bazel-bin/pkg/proto -name '*.pb.go' -delete || true\nbazel build $(bazel query --output=label 'kind(\"go_proto_library\", //...)')\nfind bazel-bin/pkg/proto -name '*.pb.go' | while read f; do\n  cat $f > $(echo $f | sed -e 's|.*/pkg/proto/|pkg/proto/|')\ndone\n"
             },
             {
                "name": "Test style conformance",
diff --git a/.github/workflows/pull-requests.yaml b/.github/workflows/pull-requests.yaml
index c90ef35b..cd400a59 100644
--- a/.github/workflows/pull-requests.yaml
+++ b/.github/workflows/pull-requests.yaml
@@ -41,7 +41,7 @@
             },
             {
                "name": "Protobuf generation",
-               "run": "find . bazel-bin/pkg/proto -name '*.pb.go' -delete || true\nbazel build $(bazel query 'kind(\"go_proto_library\", //...)')\nfind bazel-bin/pkg/proto -name '*.pb.go' | while read f; do\n  cat $f > $(echo $f | sed -e 's|.*/pkg/proto/|pkg/proto/|')\ndone\n"
+               "run": "find . bazel-bin/pkg/proto -name '*.pb.go' -delete || true\nbazel build $(bazel query --output=label 'kind(\"go_proto_library\", //...)')\nfind bazel-bin/pkg/proto -name '*.pb.go' | while read f; do\n  cat $f > $(echo $f | sed -e 's|.*/pkg/proto/|pkg/proto/|')\ndone\n"
             },
             {
                "name": "Test style conformance",
diff --git a/tools/github_workflows/workflows_template.libsonnet b/tools/github_workflows/workflows_template.libsonnet
index 8efcd440..6a2d8259 100644
--- a/tools/github_workflows/workflows_template.libsonnet
+++ b/tools/github_workflows/workflows_template.libsonnet
@@ -96,7 +96,7 @@
           name: 'Protobuf generation',
           run: |||
             find . bazel-bin/pkg/proto -name '*.pb.go' -delete || true
-            bazel build $(bazel query 'kind("go_proto_library", //...)')
+            bazel build $(bazel query --output=label 'kind("go_proto_library", //...)')
             find bazel-bin/pkg/proto -name '*.pb.go' | while read f; do
               cat $f > $(echo $f | sed -e 's|.*/pkg/proto/|pkg/proto/|')
             done