Merge pull request #10200 from filecoin-project/mikers/pack_add_git_tag

feat: pack: add git tag to builtin_actors_gen

Makefile

@@ -298,7 +298,7 @@ actors-gen: actors-code-gen fiximports
 .PHONY: actors-gen
 
 bundle-gen:
-	$(GOCC) run ./gen/bundle
+	$(GOCC) run ./gen/bundle $(RELEASE)
 	$(GOCC) fmt ./build/...
 .PHONY: bundle-gen
 
@@ -354,7 +354,7 @@ docsgen-openrpc-gateway: docsgen-openrpc-bin
 fiximports:
 	./scripts/fiximports
 
-gen: actors-code-gen type-gen cfgdoc-gen docsgen api-gen circleci bundle-gen fiximports
+gen: actors-code-gen type-gen cfgdoc-gen docsgen api-gen circleci fiximports
 	@echo ">>> IF YOU'VE MODIFIED THE CLI OR CONFIG, REMEMBER TO ALSO MAKE docsgen-cli"
 .PHONY: gen
 

build/actors/pack.sh

@@ -52,4 +52,4 @@ popd
 
 echo "Generating metadata..."
 
-make -C ../../ bundle-gen
+make -C ../../ RELEASE="$RELEASE" bundle-gen

build/builtin_actors.go

@@ -95,10 +95,11 @@ func loadManifests(netw string) error {
 }
 
 type BuiltinActorsMetadata struct {
-	Network     string
-	Version     actorstypes.Version
-	ManifestCid cid.Cid
-	Actors      map[string]cid.Cid
+	Network      string
+	Version      actorstypes.Version
+	ManifestCid  cid.Cid
+	Actors       map[string]cid.Cid
+	BundleGitTag string
 }
 
 // ReadEmbeddedBuiltinActorsMetadata reads the metadata from the embedded built-in actor bundles.

gen/bundle/bundle.go

@@ -20,6 +20,7 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
 {{- range . }} {
 	Network: {{printf "%q" .Network}},
 	Version: {{.Version}},
+	{{if .BundleGitTag}} BundleGitTag: {{printf "%q" .BundleGitTag}}, {{end}}
 	ManifestCid: MustParseCid({{printf "%q" .ManifestCid}}),
 	Actors: map[string]cid.Cid {
 	{{- range $name, $cid := .Actors }}
@@ -37,6 +38,12 @@ func main() {
 		panic(err)
 	}
 
+	if len(os.Args) > 1 {
+		for _, m := range metadata {
+			m.BundleGitTag = os.Args[1]
+		}
+	}
+
 	fi, err := os.Create("./build/builtin_actors_gen.go")
 	if err != nil {
 		panic(err)