From c7aff78d778ad2627be10d96c293a3a381e3cf5f Mon Sep 17 00:00:00 2001 From: Camila Macedo <7708031+camilamacedo86@users.noreply.github.com> Date: Fri, 17 Jan 2025 17:57:26 +0000 Subject: [PATCH] [Monorepo] fix: add ginkgo as a bingo dependency for catalogd (#1635) The tests were failing silently with the following error: trace -vv test/upgrade bash: line 1: trace: command not found This issue occurred because Ginkgo was not found to execute the tests with the specified options. --- .bingo/Variables.mk | 6 ++++++ .bingo/ginkgo.mod | 7 +++++++ .bingo/ginkgo.sum | 8 ++++++++ .bingo/variables.env | 2 ++ 4 files changed, 23 insertions(+) create mode 100644 .bingo/ginkgo.mod create mode 100644 .bingo/ginkgo.sum diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk index 4b5b0e3ae..2e1391f05 100644 --- a/.bingo/Variables.mk +++ b/.bingo/Variables.mk @@ -41,6 +41,12 @@ $(CRD_REF_DOCS): $(BINGO_DIR)/crd-ref-docs.mod @echo "(re)installing $(GOBIN)/crd-ref-docs-v0.1.0" @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" +GINKGO := $(GOBIN)/ginkgo-v2.22.2 +$(GINKGO): $(BINGO_DIR)/ginkgo.mod + @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. + @echo "(re)installing $(GOBIN)/ginkgo-v2.22.2" + @cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=ginkgo.mod -o=$(GOBIN)/ginkgo-v2.22.2 "github.com/onsi/ginkgo/v2/ginkgo" + GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.63.4 $(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod @# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies. diff --git a/.bingo/ginkgo.mod b/.bingo/ginkgo.mod new file mode 100644 index 000000000..024da10e0 --- /dev/null +++ b/.bingo/ginkgo.mod @@ -0,0 +1,7 @@ +module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT + +go 1.22.0 + +toolchain go1.23.0 + +require github.com/onsi/ginkgo/v2 v2.22.0 // ginkgo \ No newline at end of file diff --git a/.bingo/ginkgo.sum b/.bingo/ginkgo.sum new file mode 100644 index 000000000..bf4e1c138 --- /dev/null +++ b/.bingo/ginkgo.sum @@ -0,0 +1,8 @@ +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= +github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/ZoQgRgVIWFJljSWa/zetS2WTvg= +github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= +github.com/onsi/ginkgo/v2 v2.22.2 h1:/3X8Panh8/WwhU/3Ssa6rCKqPLuAkVY2I0RoyDLySlU= +github.com/onsi/ginkgo/v2 v2.22.2/go.mod h1:oeMosUL+8LtarXBHu/c0bx2D/K9zyQ6uX3cTyztHwsk= +golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8= +golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw= diff --git a/.bingo/variables.env b/.bingo/variables.env index b97764b84..63a3618d0 100644 --- a/.bingo/variables.env +++ b/.bingo/variables.env @@ -16,6 +16,8 @@ CRD_DIFF="${GOBIN}/crd-diff-v0.1.0" CRD_REF_DOCS="${GOBIN}/crd-ref-docs-v0.1.0" +GINKGO="${GOBIN}/ginkgo-v2.22.2" + GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.63.4" GORELEASER="${GOBIN}/goreleaser-v1.26.2"