Move to go:embed

Signed-off-by: Chris Koch <[email protected]>
u-root · Dec 24, 2023 · 406acb2 · 406acb2
1 parent cefa938
commit 406acb2
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 102 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -96,75 +96,58 @@ workflows:
     jobs:
       - clean-gopath
       - clean-gomod
-      - clean-makebb
       - clean-bazel
       - build-gopath-go118:
           requires:
-            - clean-makebb
             - clean-gopath
       - build-gopath-go119:
           requires:
-            - clean-makebb
             - clean-gopath
       - build-gopath-go120:
           requires:
-            - clean-makebb
             - clean-gopath
       - build-gopath-go121:
           requires:
-            - clean-makebb
             - clean-gopath
       - test-go118:
           requires:
-            - clean-makebb
             - clean-gopath
             - clean-gomod
       - test-go119:
           requires:
-            - clean-makebb
             - clean-gopath
             - clean-gomod
       - test-go120:
           requires:
-            - clean-makebb
             - clean-gopath
             - clean-gomod
       - test-go121:
           requires:
-            - clean-makebb
             - clean-gopath
             - clean-gomod
       - build-gomod-go118:
           requires:
-            - clean-makebb
             - clean-gomod
       - build-gomod-go119:
           requires:
-            - clean-makebb
             - clean-gomod
       - build-gomod-go120:
           requires:
-            - clean-makebb
             - clean-gomod
       - build-gomod-go121:
           requires:
-            - clean-makebb
             - clean-gomod
       - build-gomod-multi-go118:
           requires:
-            - clean-makebb
             - clean-gomod
       - build-gomod-multi-go119:
           requires:
-            - clean-makebb
             - clean-gomod
       - build-gomod-multi-go120:
           requires:
-            - clean-makebb
             - clean-gomod
       - build-gomod-multi-go121:
           requires:
-            - clean-makebb
             - clean-gomod
       - build-bazel:
           requires:
@@ -205,27 +188,6 @@ workflows:
       - build-bazel-test
 
 jobs:
-  clean-makebb:
-    <<: [*go121-template, *gomod-template]
-    steps:
-      - checkout
-      - run:
-          name: check generated code
-          command: |
-            mkdir -p /home/circleci/go/bin
-            go build ./src/cmd/embedvar
-            cp ./embedvar $GOPATH/bin
-            export PATH=$GOPATH/bin:$PATH
-            cd src/pkg/bb
-            go generate
-            git status
-            if [[ -n "$(git status --porcelain .)" ]]; then
-              echo 'Generated bbmain code is out of date. Run `go install ./src/cmd/embevar && cd src/pkg/bb && go generate` and then check changes in git.'
-              git status --porcelain .
-              git diff
-              exit 1
-            fi
-
   clean-gopath:
     <<: [*go121-template, *gopath-template]
     steps:

diff --git a/src/cmd/embedvar/.gitignore b/src/cmd/embedvar/.gitignore
diff --git a/src/cmd/embedvar/BUILD.bazel b/src/cmd/embedvar/BUILD.bazel
diff --git a/src/cmd/embedvar/embedvar.go b/src/cmd/embedvar/embedvar.go
diff --git a/src/pkg/bb/BUILD.bazel b/src/pkg/bb/BUILD.bazel
@@ -1,12 +1,13 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_embed_data", "go_library")
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 go_library(
     name = "bb",
     srcs = [
         "bb.go",
-        "bbmain_src.go",
-        "bbregister_src.go",
-        "generate.go",
+    ],
+    embedsrcs = [
+        "//src/pkg/bb/bbmain/cmd:main.go",
+        "//src/pkg/bb/bbmain:register.go",
     ],
     importpath = "github.com/u-root/gobusybox/src/pkg/bb",
     visibility = ["//visibility:public"],

diff --git a/src/pkg/bb/bb.go b/src/pkg/bb/bb.go
@@ -24,6 +24,7 @@
 package bb
 
 import (
+	_ "embed"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -45,6 +46,12 @@ import (
 	"github.com/u-root/uio/ulog"
 )
 
+//go:embed bbmain/cmd/main.go
+var bbMainSource []byte
+
+//go:embed bbmain/register.go
+var bbRegisterSource []byte
+
 func listStrings(m map[string]struct{}) []string {
 	var l []string
 	for k := range m {

diff --git a/src/pkg/bb/bbmain/BUILD.bazel b/src/pkg/bb/bbmain/BUILD.bazel
@@ -1,5 +1,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
+exports_files(["register.go"])
+
 go_library(
     name = "bbmain",
     srcs = ["register.go"],

diff --git a/src/pkg/bb/bbmain_src.go b/src/pkg/bb/bbmain_src.go
diff --git a/src/pkg/bb/bbregister_src.go b/src/pkg/bb/bbregister_src.go
diff --git a/src/pkg/bb/generate.go b/src/pkg/bb/generate.go