Skip to content

Commit e404e29

Browse files
authored
Merge branch 'main' into bundle-validation
2 parents bc74769 + db164cc commit e404e29

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,8 @@ E2E_REGISTRY_IMAGE=localhost/e2e-test-registry:devel
226226
image-registry: export GOOS=linux
227227
image-registry: export GOARCH=amd64
228228
image-registry: ## Build the testdata catalog used for e2e tests and push it to the image registry
229-
go build $(GO_BUILD_FLAGS) -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o ./testdata/registry/bin/registry ./testdata/registry/registry.go
230-
go build $(GO_BUILD_FLAGS) -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o ./testdata/push/bin/push ./testdata/push/push.go
229+
go build $(GO_BUILD_FLAGS) $(GO_BUILD_EXTRA_FLAGS) -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o ./testdata/registry/bin/registry ./testdata/registry/registry.go
230+
go build $(GO_BUILD_FLAGS) $(GO_BUILD_EXTRA_FLAGS) -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o ./testdata/push/bin/push ./testdata/push/push.go
231231
$(CONTAINER_RUNTIME) build -f ./testdata/Dockerfile -t $(E2E_REGISTRY_IMAGE) ./testdata
232232
$(CONTAINER_RUNTIME) save $(E2E_REGISTRY_IMAGE) | $(KIND) load image-archive /dev/stdin --name $(KIND_CLUSTER_NAME)
233233
./testdata/build-test-registry.sh $(E2E_REGISTRY_NAMESPACE) $(E2E_REGISTRY_NAME) $(E2E_REGISTRY_IMAGE)
@@ -240,7 +240,7 @@ image-registry: ## Build the testdata catalog used for e2e tests and push it to
240240
.PHONY: test-e2e
241241
test-e2e: KIND_CLUSTER_NAME := operator-controller-e2e
242242
test-e2e: KUSTOMIZE_BUILD_DIR := config/overlays/e2e
243-
test-e2e: GO_BUILD_FLAGS := -cover
243+
test-e2e: GO_BUILD_EXTRA_FLAGS := -cover
244244
test-e2e: run image-registry e2e e2e-coverage kind-clean #HELP Run e2e test suite on local kind cluster
245245

246246
.PHONY: extension-developer-e2e
@@ -317,7 +317,7 @@ export VERSION_PATH := ${GIT_REPO}/internal/shared/version
317317
export GO_BUILD_TAGS := containers_image_openpgp
318318
export GO_BUILD_ASMFLAGS := all=-trimpath=$(PWD)
319319
export GO_BUILD_GCFLAGS := all=-trimpath=$(PWD)
320-
export GO_BUILD_FLAGS :=
320+
export GO_BUILD_EXTRA_FLAGS :=
321321
export GO_BUILD_LDFLAGS := -s -w \
322322
-X '$(VERSION_PATH).version=$(VERSION)' \
323323
-X '$(VERSION_PATH).gitCommit=$(GIT_COMMIT)' \
@@ -326,7 +326,7 @@ BINARIES=operator-controller catalogd
326326

327327
.PHONY: $(BINARIES)
328328
$(BINARIES):
329-
go build $(GO_BUILD_FLAGS) -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o $(BUILDBIN)/$@ ./cmd/$@
329+
go build $(GO_BUILD_FLAGS) $(GO_BUILD_EXTRA_FLAGS) -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o $(BUILDBIN)/$@ ./cmd/$@
330330

331331
.PHONY: build-deps
332332
build-deps: manifests generate fmt

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ markdown2==2.5.3
1414
MarkupSafe==3.0.2
1515
mergedeep==1.3.4
1616
mkdocs==1.6.1
17-
mkdocs-material==9.6.9
17+
mkdocs-material==9.6.10
1818
mkdocs-material-extensions==1.3.1
1919
packaging==24.2
2020
paginate==0.5.7

0 commit comments

Comments
 (0)