Skip to content

Commit 1bc935e

Browse files
author
Per Goncalves da Silva
committed
Remove ginkgo from bingo in favor of go.mod version
Signed-off-by: Per Goncalves da Silva <[email protected]>
1 parent e77c53c commit 1bc935e

File tree

5 files changed

+4
-25
lines changed

5 files changed

+4
-25
lines changed

.bingo/Variables.mk

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,6 @@ $(CRD_REF_DOCS): $(BINGO_DIR)/crd-ref-docs.mod
4141
@echo "(re)installing $(GOBIN)/crd-ref-docs-v0.1.0"
4242
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=crd-ref-docs.mod -o=$(GOBIN)/crd-ref-docs-v0.1.0 "github.com/elastic/crd-ref-docs"
4343

44-
GINKGO := $(GOBIN)/ginkgo-v2.22.2
45-
$(GINKGO): $(BINGO_DIR)/ginkgo.mod
46-
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
47-
@echo "(re)installing $(GOBIN)/ginkgo-v2.22.2"
48-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=ginkgo.mod -o=$(GOBIN)/ginkgo-v2.22.2 "github.com/onsi/ginkgo/v2/ginkgo"
49-
5044
GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.63.4
5145
$(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
5246
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.

.bingo/ginkgo.mod

Lines changed: 0 additions & 7 deletions
This file was deleted.

.bingo/ginkgo.sum

Lines changed: 0 additions & 8 deletions
This file was deleted.

.bingo/variables.env

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ CRD_DIFF="${GOBIN}/crd-diff-v0.1.0"
1616

1717
CRD_REF_DOCS="${GOBIN}/crd-ref-docs-v0.1.0"
1818

19-
GINKGO="${GOBIN}/ginkgo-v2.22.2"
20-
2119
GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.63.4"
2220

2321
GORELEASER="${GOBIN}/goreleaser-v1.26.2"

catalogd/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ TESTDATA_DIR := testdata
4444
CATALOGD_NAMESPACE := olmv1-system
4545
KIND_CLUSTER_IMAGE := kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e
4646

47+
GINKGO := go run github.com/onsi/ginkgo/v2/ginkgo
48+
4749
##@ General
4850

4951
# The help target prints out all targets with their descriptions organized
@@ -76,7 +78,7 @@ FOCUS := $(if $(TEST),-v -focus "$(TEST)")
7678
ifeq ($(origin E2E_FLAGS), undefined)
7779
E2E_FLAGS :=
7880
endif
79-
test-e2e: $(GINKGO) ## Run the e2e tests on existing cluster
81+
test-e2e: ## Run the e2e tests on existing cluster
8082
$(GINKGO) $(E2E_FLAGS) -trace -vv $(FOCUS) test/e2e
8183

8284
e2e: KIND_CLUSTER_NAME := catalogd-e2e
@@ -105,7 +107,7 @@ run-latest-release:
105107
cd ..; curl -L -s https://github.com/operator-framework/operator-controller/releases/latest/download/install.sh | bash -s
106108

107109
.PHONY: post-upgrade-checks
108-
post-upgrade-checks: $(GINKGO)
110+
post-upgrade-checks:
109111
$(GINKGO) $(E2E_FLAGS) -trace -vv $(FOCUS) test/upgrade
110112

111113
##@ Build

0 commit comments

Comments
 (0)