Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate goreleaser into repo #10459

Merged
merged 10 commits into from
Jan 17, 2025
+155 −31
Merged

Integrate goreleaser into repo #10459

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7b07d89
Integrate goreleaser into repo
timflannagan Jan 15, 2025
5d8fe52
Makefile: Fix LDFLAGS quoting issues
timflannagan Jan 15, 2025
154956f
.github: Print out variables in release.yaml to debug faillure
timflannagan Jan 15, 2025
a2489d9
.github: Don't pass empty GORELEASER_ARGS
timflannagan Jan 15, 2025
bd3453d
Revert back to the quay.io/solo-io image registry and export gloo ima…
timflannagan Jan 16, 2025
eb47b08
Makefile: Additional LDFLAG quoting issues + replicate with GCFLAG
timflannagan Jan 16, 2025
db8d8a2
Merge remote-tracking branch 'upstream/main' into chore/add-goreleaser
timflannagan Jan 16, 2025
980de31
.github/workflows: Temporarily revert IMAGE_REGISTRY to quay.io/solo-io
timflannagan Jan 16, 2025
033620e
.github/workflows: Remove unused id-token permission in release.yaml
timflannagan Jan 16, 2025
64938bb
Merge remote-tracking branch 'upstream/main' into chore/add-goreleaser
timflannagan Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Makefile: Additional LDFLAG quoting issues + replicate with GCFLAG 
Signed-off-by: timflannagan <[email protected]>
@timflannagan
timflannagan committed Jan 16, 2025

Verified

This commit was signed with the committer’s verified signature.
timflannagan Tim Flannagan
GPG key ID: F7FF140C66531643
Verified
Learn about vigilant mode
commit eb47b08e2f371f6a40646f8a1e077f6498e87643
14 changes: 7 additions & 7 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -423,7 +423,7 @@ INGRESS_SOURCES=$(call get_sources,$(INGRESS_DIR))
INGRESS_OUTPUT_DIR=$(OUTPUT_DIR)/$(INGRESS_DIR)

$(INGRESS_OUTPUT_DIR)/ingress-linux-$(GOARCH): $(INGRESS_SOURCES)
$(GO_BUILD_FLAGS) GOOS=linux go build -ldflags='$(LDFLAGS)' -gcflags=$(GCFLAGS) -o $@ $(INGRESS_DIR)/cmd/main.go
$(GO_BUILD_FLAGS) GOOS=linux go build -ldflags='$(LDFLAGS)' -gcflags='$(GCFLAGS)' -o $@ $(INGRESS_DIR)/cmd/main.go

.PHONY: ingress
ingress: $(INGRESS_OUTPUT_DIR)/ingress-linux-$(GOARCH)
@@ -457,7 +457,7 @@ ACCESS_LOG_SOURCES=$(call get_sources,$(ACCESS_LOG_DIR))
ACCESS_LOG_OUTPUT_DIR=$(OUTPUT_DIR)/$(ACCESS_LOG_DIR)

$(ACCESS_LOG_OUTPUT_DIR)/access-logger-linux-$(GOARCH): $(ACCESS_LOG_SOURCES)
$(GO_BUILD_FLAGS) GOOS=linux go build -ldflags='$(LDFLAGS)' -gcflags=$(GCFLAGS) -o $@ $(ACCESS_LOG_DIR)/cmd/main.go
$(GO_BUILD_FLAGS) GOOS=linux go build -ldflags='$(LDFLAGS)' -gcflags='$(GCFLAGS)' -o $@ $(ACCESS_LOG_DIR)/cmd/main.go

.PHONY: access-logger
access-logger: $(ACCESS_LOG_OUTPUT_DIR)/access-logger-linux-$(GOARCH)
@@ -491,7 +491,7 @@ DISCOVERY_SOURCES=$(call get_sources,$(DISCOVERY_DIR))
DISCOVERY_OUTPUT_DIR=$(OUTPUT_DIR)/$(DISCOVERY_DIR)

$(DISCOVERY_OUTPUT_DIR)/discovery-linux-$(GOARCH): $(DISCOVERY_SOURCES)
$(GO_BUILD_FLAGS) GOOS=linux go build -ldflags='$(LDFLAGS)' -gcflags=$(GCFLAGS) -o $@ $(DISCOVERY_DIR)/cmd/main.go
$(GO_BUILD_FLAGS) GOOS=linux go build -ldflags='$(LDFLAGS)' -gcflags='$(GCFLAGS)' -o $@ $(DISCOVERY_DIR)/cmd/main.go

.PHONY: discovery
discovery: $(DISCOVERY_OUTPUT_DIR)/discovery-linux-$(GOARCH)
@@ -532,7 +532,7 @@ export GLOO_IMAGE_REPO ?= gloo
# We include the files in EDGE_GATEWAY_DIR and K8S_GATEWAY_DIR as dependencies to the gloo build
# so changes in those directories cause the make target to rebuild
$(GLOO_OUTPUT_DIR)/gloo-linux-$(GOARCH): $(GLOO_SOURCES) $(EDGE_GATEWAY_SOURCES) $(K8S_GATEWAY_SOURCES)
$(GO_BUILD_FLAGS) GOOS=linux go build -ldflags='$(LDFLAGS)' -gcflags=$(GCFLAGS) -o $@ $(GLOO_DIR)/cmd/main.go
$(GO_BUILD_FLAGS) GOOS=linux go build -ldflags='$(LDFLAGS)' -gcflags='$(GCFLAGS)' -o $@ $(GLOO_DIR)/cmd/main.go

.PHONY: gloo
gloo: $(GLOO_OUTPUT_DIR)/gloo-linux-$(GOARCH)
@@ -617,7 +617,7 @@ SDS_SOURCES=$(call get_sources,$(SDS_DIR))
SDS_OUTPUT_DIR=$(OUTPUT_DIR)/$(SDS_DIR)

$(SDS_OUTPUT_DIR)/sds-linux-$(GOARCH): $(SDS_SOURCES)
$(GO_BUILD_FLAGS) GOOS=linux go build -ldflags='$(LDFLAGS)' -gcflags=$(GCFLAGS) -o $@ $(SDS_DIR)/cmd/main.go
$(GO_BUILD_FLAGS) GOOS=linux go build -ldflags='$(LDFLAGS)' -gcflags='$(GCFLAGS)' -o $@ $(SDS_DIR)/cmd/main.go

.PHONY: sds
sds: $(SDS_OUTPUT_DIR)/sds-linux-$(GOARCH)
@@ -651,7 +651,7 @@ ENVOYINIT_SOURCES=$(call get_sources,$(ENVOYINIT_DIR))
ENVOYINIT_OUTPUT_DIR=$(OUTPUT_DIR)/$(ENVOYINIT_DIR)

$(ENVOYINIT_OUTPUT_DIR)/envoyinit-linux-$(GOARCH): $(ENVOYINIT_SOURCES)
$(GO_BUILD_FLAGS) GOOS=linux go build -ldflags='$(LDFLAGS)' -gcflags=$(GCFLAGS) -o $@ $(ENVOYINIT_DIR)/main.go
$(GO_BUILD_FLAGS) GOOS=linux go build -ldflags='$(LDFLAGS)' -gcflags='$(GCFLAGS)' -o $@ $(ENVOYINIT_DIR)/main.go

.PHONY: envoyinit
envoyinit: $(ENVOYINIT_OUTPUT_DIR)/envoyinit-linux-$(GOARCH)
@@ -690,7 +690,7 @@ CERTGEN_SOURCES=$(call get_sources,$(CERTGEN_DIR))
CERTGEN_OUTPUT_DIR=$(OUTPUT_DIR)/$(CERTGEN_DIR)

$(CERTGEN_OUTPUT_DIR)/certgen-linux-$(GOARCH): $(CERTGEN_SOURCES)
$(GO_BUILD_FLAGS) GOOS=linux go build -ldflags='$(LDFLAGS)' -gcflags=$(GCFLAGS) -o $@ $(CERTGEN_DIR)/main.go
$(GO_BUILD_FLAGS) GOOS=linux go build -ldflags='$(LDFLAGS)' -gcflags='$(GCFLAGS)' -o $@ $(CERTGEN_DIR)/main.go

.PHONY: certgen
certgen: $(CERTGEN_OUTPUT_DIR)/certgen-linux-$(GOARCH)
12 changes: 6 additions & 6 deletions Makefile.ci
View file
Original file line number Diff line number Diff line change
@@ -8,19 +8,19 @@
CLI_DIR=projects/gloo/cli

$(OUTPUT_DIR)/glooctl: $(SOURCES)
GO111MODULE=on go build -ldflags=$(LDFLAGS) -gcflags=$(GCFLAGS) -o $@ $(CLI_DIR)/cmd/main.go $(STDERR_SILENCE_REDIRECT)
GO111MODULE=on go build -ldflags='$(LDFLAGS)' -gcflags='$(GCFLAGS)' -o $@ $(CLI_DIR)/cmd/main.go $(STDERR_SILENCE_REDIRECT)

$(OUTPUT_DIR)/glooctl-linux-amd64: $(SOURCES)
$(GO_BUILD_FLAGS) GOOS=linux GOARCH=amd64 go build -ldflags=$(LDFLAGS) -gcflags=$(GCFLAGS) -o $@ $(CLI_DIR)/cmd/main.go $(STDERR_SILENCE_REDIRECT)
$(GO_BUILD_FLAGS) GOOS=linux GOARCH=amd64 go build -ldflags='$(LDFLAGS)' -gcflags='$(GCFLAGS)' -o $@ $(CLI_DIR)/cmd/main.go $(STDERR_SILENCE_REDIRECT)
$(OUTPUT_DIR)/glooctl-linux-arm64: $(SOURCES)
$(GO_BUILD_FLAGS) GOOS=linux GOARCH=arm64 go build -ldflags=$(LDFLAGS) -gcflags=$(GCFLAGS) -o $@ $(CLI_DIR)/cmd/main.go $(STDERR_SILENCE_REDIRECT)
$(GO_BUILD_FLAGS) GOOS=linux GOARCH=arm64 go build -ldflags='$(LDFLAGS)' -gcflags='$(GCFLAGS)' -o $@ $(CLI_DIR)/cmd/main.go $(STDERR_SILENCE_REDIRECT)
$(OUTPUT_DIR)/glooctl-darwin-amd64: $(SOURCES)
$(GO_BUILD_FLAGS) GOOS=darwin GOARCH=amd64 go build -ldflags=$(LDFLAGS) -gcflags=$(GCFLAGS) -o $@ $(CLI_DIR)/cmd/main.go $(STDERR_SILENCE_REDIRECT)
$(GO_BUILD_FLAGS) GOOS=darwin GOARCH=amd64 go build -ldflags='$(LDFLAGS)' -gcflags='$(GCFLAGS)' -o $@ $(CLI_DIR)/cmd/main.go $(STDERR_SILENCE_REDIRECT)
$(OUTPUT_DIR)/glooctl-darwin-arm64: $(SOURCES)
$(GO_BUILD_FLAGS) GOOS=darwin GOARCH=arm64 go build -ldflags=$(LDFLAGS) -gcflags=$(GCFLAGS) -o $@ $(CLI_DIR)/cmd/main.go $(STDERR_SILENCE_REDIRECT)
$(GO_BUILD_FLAGS) GOOS=darwin GOARCH=arm64 go build -ldflags='$(LDFLAGS)' -gcflags='$(GCFLAGS)' -o $@ $(CLI_DIR)/cmd/main.go $(STDERR_SILENCE_REDIRECT)

$(OUTPUT_DIR)/glooctl-windows-$(GOARCH).exe: $(SOURCES)
$(GO_BUILD_FLAGS) GOOS=windows GOARCH=$(GOARCH) go build -ldflags=$(LDFLAGS) -gcflags=$(GCFLAGS) -o $@ $(CLI_DIR)/cmd/main.go $(STDERR_SILENCE_REDIRECT)
$(GO_BUILD_FLAGS) GOOS=windows GOARCH=$(GOARCH) go build -ldflags='$(LDFLAGS)' -gcflags='$(GCFLAGS)' -o $@ $(CLI_DIR)/cmd/main.go $(STDERR_SILENCE_REDIRECT)


.PHONY: glooctl