Check in assets that we "//go:embed" into our executables

This makes it easier to import Buildbarn packages from within non-Bazel projects.
buildbarn · Feb 9, 2024 · 4b977d3 · 4b977d3
1 parent d35992e
commit 4b977d3
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 3 deletions.
diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
@@ -43,9 +43,13 @@
                "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"
             },
+            {
+               "name": "Embedded asset generation",
+               "run": "bazel build $(git grep '^[[:space:]]*//go:embed ' | sed -e 's|\\(.*\\)/.*//go:embed |//\\1:|' | sort -u)\ngit grep '^[[:space:]]*//go:embed ' | sed -e 's|\\(.*\\)/.*//go:embed |\\1/|' | while read o; do\n  if [ -e \"bazel-bin/$o\" ]; then\n    rm -rf \"$o\"\n    cp -r \"bazel-bin/$o\" \"$o\"\n    find \"$o\" -type f -exec chmod -x {} +\n  fi\ndone\n"
+            },
             {
                "name": "Test style conformance",
-               "run": "git diff --exit-code HEAD --"
+               "run": "git add . && git diff --exit-code HEAD --"
             },
             {
                "name": "Golint",

diff --git a/.github/workflows/pull-requests.yaml b/.github/workflows/pull-requests.yaml
@@ -43,9 +43,13 @@
                "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"
             },
+            {
+               "name": "Embedded asset generation",
+               "run": "bazel build $(git grep '^[[:space:]]*//go:embed ' | sed -e 's|\\(.*\\)/.*//go:embed |//\\1:|' | sort -u)\ngit grep '^[[:space:]]*//go:embed ' | sed -e 's|\\(.*\\)/.*//go:embed |\\1/|' | while read o; do\n  if [ -e \"bazel-bin/$o\" ]; then\n    rm -rf \"$o\"\n    cp -r \"bazel-bin/$o\" \"$o\"\n    find \"$o\" -type f -exec chmod -x {} +\n  fi\ndone\n"
+            },
             {
                "name": "Test style conformance",
-               "run": "git diff --exit-code HEAD --"
+               "run": "git add . && git diff --exit-code HEAD --"
             },
             {
                "name": "Golint",

diff --git a/pkg/otel/stylesheet.css b/pkg/otel/stylesheet.css
diff --git a/tools/github_workflows/workflows_template.libsonnet b/tools/github_workflows/workflows_template.libsonnet
@@ -102,9 +102,22 @@
             done
           |||,
         },
+        {
+          name: 'Embedded asset generation',
+          run: |||
+            bazel build $(git grep '^[[:space:]]*//go:embed ' | sed -e 's|\(.*\)/.*//go:embed |//\1:|' | sort -u)
+            git grep '^[[:space:]]*//go:embed ' | sed -e 's|\(.*\)/.*//go:embed |\1/|' | while read o; do
+              if [ -e "bazel-bin/$o" ]; then
+                rm -rf "$o"
+                cp -r "bazel-bin/$o" "$o"
+                find "$o" -type f -exec chmod -x {} +
+              fi
+            done
+          |||,
+        },
         {
           name: 'Test style conformance',
-          run: 'git diff --exit-code HEAD --',
+          run: 'git add . && git diff --exit-code HEAD --',
         },
         {
           name: 'Golint',