fix ld flag [goreleaser]

synapsecns · Aug 7, 2024 · bc86a8d · bc86a8d
1 parent b7c5216
commit bc86a8d
Show file tree

Hide file tree

Showing 19 changed files with 25 additions and 29 deletions.
diff --git a/agents/.goreleaser.yml b/agents/.goreleaser.yml
@@ -12,7 +12,7 @@ builds:
       - all=-dwarflocationlists=true
     ldflags:
       # We need to build a static binary because we are building in a glibc based system and running in a musl container
-       - -s -w -extldflags '-static' -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{ .CommitDate }}
+       - -s -w -extldflags '-static' -X github.com/synapsecns/sanguine/core/config.DefaultVersion={{.Version}} -X github.com/synapsecns/sanguine/core/config.DefaultCommit={{.Commit}} -X github.com/synapsecns/sanguine/core/config.DefaultDate={{ .CommitDate }}
     # required workaround for https://github.com/Shopify/sarama/issues/2206
     # See: https://github.com/golang/go/issues/35067#issuecomment-544805311 because we're statically compiling,
     # without forcing netgo, we use the cgo resolver which will not work for .local (a canonical tld in kubernetes)

diff --git a/contrib/opbot/.goreleaser.yml b/contrib/opbot/.goreleaser.yml
@@ -10,7 +10,7 @@ builds:
     binary: opbot
     ldflags:
       # We need to build a static binary because we are building in a glibc based system and running in a musl container
-       - -s -w -extldflags '-static' -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{ .CommitDate }}
+       - -s -w -extldflags '-static' -X github.com/synapsecns/sanguine/core/config.DefaultVersion={{.Version}} -X github.com/synapsecns/sanguine/core/config.DefaultCommit={{.Commit}} -X github.com/synapsecns/sanguine/core/config.DefaultDate={{ .CommitDate }}
     gcflags:
       - all=-dwarflocationlists=true
     # required workaround for https://github.com/Shopify/sarama/issues/2206
@@ -33,7 +33,7 @@ builds:
     binary: signozexample
     ldflags:
       # We need to build a static binary because we are building in a glibc based system and running in a musl container
-       - -s -w -extldflags '-static' -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{ .CommitDate }}
+       - -s -w -extldflags '-static' -X github.com/synapsecns/sanguine/core/config.DefaultVersion={{.Version}} -X github.com/synapsecns/sanguine/core/config.DefaultCommit={{.Commit}} -X github.com/synapsecns/sanguine/core/config.DefaultDate={{ .CommitDate }}
     # see above about workaround
     tags:
       - netgo

diff --git a/contrib/screener-api/.goreleaser.yml b/contrib/screener-api/.goreleaser.yml
@@ -12,7 +12,7 @@ builds:
       - all=-dwarflocationlists=true
     ldflags:
       # We need to build a static binary because we are building in a glibc based system and running in a musl container
-       - -s -w -extldflags '-static' -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{ .CommitDate }}
+       - -s -w -extldflags '-static' -X github.com/synapsecns/sanguine/core/config.DefaultVersion={{.Version}} -X github.com/synapsecns/sanguine/core/config.DefaultCommit={{.Commit}} -X github.com/synapsecns/sanguine/core/config.DefaultDate={{ .CommitDate }}
     # required workaround for https://github.com/Shopify/sarama/issues/2206
     # See: https://github.com/golang/go/issues/35067#issuecomment-544805311 because we're statically compiling,
     # without forcing netgo, we use the cgo resolver which will not work for .local (a canonical tld in kubernetes)

diff --git a/core/metrics/rookout.go b/core/metrics/rookout.go
@@ -4,6 +4,7 @@ import (
 	rookout "github.com/Rookout/GoSDK"
 	"github.com/Rookout/GoSDK/pkg/config"
 	"github.com/synapsecns/sanguine/core"
+	synconfig "github.com/synapsecns/sanguine/core/config"
 	"github.com/synapsecns/sanguine/core/metrics/internal"
 	"os"
 )
@@ -14,8 +15,11 @@ func init() {
 	if core.HasEnv(internal.RookoutToken) {
 		// TODO: Consider doing git stuff here.
 		err := rookout.Start(config.RookOptions{
-			Token: os.Getenv(internal.RookoutToken),
-			Debug: core.HasEnv(internal.RookoutDebug),
+			Token:     os.Getenv(internal.RookoutToken),
+			Debug:     core.HasEnv(internal.RookoutDebug),
+			GitCommit: synconfig.DefaultCommit,
+			// note: will chagne on fork
+			GitOrigin: "https://github.com/synapsecns/sanguine",
 		})
 		if err != nil {
 			logger.Warn(err)

diff --git a/docker/.dockerignore b/docker/.dockerignore
diff --git a/docker/agents.Dockerfile b/docker/agents.Dockerfile
@@ -12,7 +12,7 @@ USER nonroot:nonroot
 WORKDIR /app
 COPY --chown=nonroot:nonroot agents /app/agents
 
-COPY .git /.git
+
 
 
 ENTRYPOINT ["/app/agents"]
diff --git a/docker/cctp-relayer.Dockerfile b/docker/cctp-relayer.Dockerfile
@@ -12,6 +12,4 @@ USER nonroot:nonroot
 WORKDIR /app
 COPY --chown=nonroot:nonroot cctp-relayer /app/cctp-relayer
 
-COPY .git /.git
-
 ENTRYPOINT ["/app/cctp-relayer"]
diff --git a/docker/explorer.Dockerfile b/docker/explorer.Dockerfile
@@ -12,6 +12,6 @@ USER nonroot:nonroot
 WORKDIR /app
 COPY --chown=nonroot:nonroot explorer /app/explorer
 
-COPY .git /.git
+
 
 ENTRYPOINT ["/app/explorer"]
diff --git a/docker/git-changes-action.Dockerfile b/docker/git-changes-action.Dockerfile
@@ -26,6 +26,6 @@ COPY --from=builder /etc/passwd /etc/passwd
 WORKDIR /git-changes-action
 COPY git-changes-action /app/git-changes-action
 
-COPY .git /.git
+
 
 ENTRYPOINT ["/app/git-changes-action"]
diff --git a/docker/omnirpc.Dockerfile b/docker/omnirpc.Dockerfile
@@ -12,6 +12,6 @@ USER nonroot:nonroot
 WORKDIR /app
 COPY --chown=nonroot:nonroot omnirpc /app/omnirpc
 
-COPY .git /.git
+
 
 ENTRYPOINT ["/app/omnirpc"]
diff --git a/docker/opbot.Dockerfile b/docker/opbot.Dockerfile
@@ -12,6 +12,6 @@ USER nonroot:nonroot
 WORKDIR /app
 COPY --chown=nonroot:nonroot opbot /app/opbot
 
-COPY .git /.git
+
 
 ENTRYPOINT ["/app/opbot"]
diff --git a/docker/promexporter.Dockerfile b/docker/promexporter.Dockerfile
@@ -12,6 +12,6 @@ USER nonroot:nonroot
 WORKDIR /app
 COPY --chown=nonroot:nonroot promexporter /app/promexporter
 
-COPY .git /.git
+
 
 ENTRYPOINT ["/app/promexporter"]
diff --git a/docker/rfq-api.Dockerfile b/docker/rfq-api.Dockerfile
@@ -12,6 +12,6 @@ USER nonroot:nonroot
 WORKDIR /app
 COPY --chown=nonroot:nonroot api /app/api
 
-COPY .git /.git
+
 
 ENTRYPOINT ["/app/api"]
diff --git a/docker/rfq-relayer.Dockerfile b/docker/rfq-relayer.Dockerfile
@@ -12,6 +12,6 @@ USER nonroot:nonroot
 WORKDIR /app
 COPY --chown=nonroot:nonroot relayer /app/relayer
 
-COPY .git /.git
+
 
 ENTRYPOINT ["/app/relayer"]
diff --git a/docker/screener-api.Dockerfile b/docker/screener-api.Dockerfile
@@ -12,6 +12,6 @@ USER nonroot:nonroot
 WORKDIR /app
 COPY --chown=nonroot:nonroot screener /app/screener
 
-COPY .git /.git
+
 
 ENTRYPOINT ["/app/screener"]
diff --git a/docker/scribe.Dockerfile b/docker/scribe.Dockerfile
@@ -12,6 +12,6 @@ USER nonroot:nonroot
 WORKDIR /app
 COPY --chown=nonroot:nonroot scribe /app/scribe
 
-COPY .git /.git
+
 
 ENTRYPOINT ["/app/scribe"]
diff --git a/ethergo/.goreleaser.yml b/ethergo/.goreleaser.yml
@@ -12,7 +12,7 @@ builds:
       - all=-dwarflocationlists=true
     ldflags:
       # We need to build a static binary because we are building in a glibc based system and running in a musl container
-       - -s -w -extldflags '-static' -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{ .CommitDate }}
+       - -s -w -extldflags '-static' -X github.com/synapsecns/sanguine/core/config.DefaultVersion={{.Version}} -X github.com/synapsecns/sanguine/core/config.DefaultCommit={{.Commit}} -X github.com/synapsecns/sanguine/core/config.DefaultDate={{ .CommitDate }}
     # required workaround for https://github.com/Shopify/sarama/issues/2206
     # See: https://github.com/golang/go/issues/35067#issuecomment-544805311 because we're statically compiling,
     # without forcing netgo, we use the cgo resolver which will not work for .local (a canonical tld in kubernetes)

diff --git a/services/omnirpc/.goreleaser.yml b/services/omnirpc/.goreleaser.yml
@@ -13,7 +13,7 @@ builds:
       - all=-dwarflocationlists=true
     ldflags:
       # We need to build a static binary because we are building in a glibc based system and running in a musl container
-       - -s -w -extldflags '-static' -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{ .CommitDate }}
+       - -s -w -extldflags '-static' -X github.com/synapsecns/sanguine/core/config.DefaultVersion={{.Version}} -X github.com/synapsecns/sanguine/core/config.DefaultCommit={{.Commit}} -X github.com/synapsecns/sanguine/core/config.DefaultDate={{ .CommitDate }}
     # required workaround for https://github.com/Shopify/sarama/issues/2206
     # See: https://github.com/golang/go/issues/35067#issuecomment-544805311 because we're statically compiling,
     # without forcing netgo, we use the cgo resolver which will not work for .local (a canonical tld in kubernetes)

diff --git a/services/rfq/.goreleaser.yml b/services/rfq/.goreleaser.yml
@@ -12,7 +12,7 @@ builds:
       - all=-dwarflocationlists=true
     ldflags:
       # We need to build a static binary because we are building in a glibc based system and running in a musl container
-       - -s -w -extldflags '-static' -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{ .CommitDate }}
+       - -s -w -extldflags '-static' -X github.com/synapsecns/sanguine/core/config.DefaultVersion={{.Version}} -X github.com/synapsecns/sanguine/core/config.DefaultCommit={{.Commit}} -X github.com/synapsecns/sanguine/core/config.DefaultDate={{ .CommitDate }}
     # required workaround for https://github.com/Shopify/sarama/issues/2206
     # See: https://github.com/golang/go/issues/35067#issuecomment-544805311 because we're statically compiling,
     # without forcing netgo, we use the cgo resolver which will not work for .local (a canonical tld in kubernetes)
@@ -36,7 +36,7 @@ builds:
       - all=-dwarflocationlists=true
     ldflags:
       # We need to build a static binary because we are building in a glibc based system and running in a musl container
-       - -s -w -extldflags '-static' -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{ .CommitDate }}
+       - -s -w -extldflags '-static' -X github.com/synapsecns/sanguine/core/config.DefaultVersion={{.Version}} -X github.com/synapsecns/sanguine/core/config.DefaultCommit={{.Commit}} -X github.com/synapsecns/sanguine/core/config.DefaultDate={{ .CommitDate }}
     # see above about workaround
     tags:
       - netgo
@@ -55,7 +55,7 @@ builds:
       - all=-dwarflocationlists=true
     ldflags:
       # We need to build a static binary because we are building in a glibc based system and running in a musl container
-       - -s -w -extldflags '-static' -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{ .CommitDate }}
+       - -s -w -extldflags '-static' -X github.com/synapsecns/sanguine/core/config.DefaultVersion={{.Version}} -X github.com/synapsecns/sanguine/core/config.DefaultCommit={{.Commit}} -X github.com/synapsecns/sanguine/core/config.DefaultDate={{ .CommitDate }}
     # see above about workaround
     tags:
       - netgo