From d2b6f9325659514dd44415bb5d9c80178861f887 Mon Sep 17 00:00:00 2001
From: Dawid Rogaczewski <20227477+daroga0002@users.noreply.github.com>
Date: Thu, 28 Sep 2023 18:58:22 +0200
Subject: [PATCH] fix ginko versions (#1983)

---
 .github/workflows/e2e-test-ci-v2-cron-dev.yml | 3 ++-
 .github/workflows/e2e-test-ci-v2-cron.yml     | 3 ++-
 .github/workflows/e2e-test-ci.yml             | 3 ++-
 .github/workflows/k8s-timer-ci.yml            | 3 ++-
 Makefile                                      | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/e2e-test-ci-v2-cron-dev.yml b/.github/workflows/e2e-test-ci-v2-cron-dev.yml
index dd00a7b4e5..787d632ab6 100644
--- a/.github/workflows/e2e-test-ci-v2-cron-dev.yml
+++ b/.github/workflows/e2e-test-ci-v2-cron-dev.yml
@@ -165,7 +165,8 @@ jobs:
 
       - name: Install ginkgo
         run: |
-          go install github.com/onsi/ginkgo/v2/ginkgo@v2.12.0
+          GINKGO_VERSION=$(cd test/e2e && go list -m  -mod=readonly  -f {{.Version}}  github.com/onsi/ginkgo/v2)
+          go install github.com/onsi/ginkgo/v2/ginkgo@$GINKGO_VERSION
           sudo cp ~/go/bin/ginkgo /usr/local/bin
 
       - name: cache
diff --git a/.github/workflows/e2e-test-ci-v2-cron.yml b/.github/workflows/e2e-test-ci-v2-cron.yml
index 5b2f7ba62c..36707fb356 100644
--- a/.github/workflows/e2e-test-ci-v2-cron.yml
+++ b/.github/workflows/e2e-test-ci-v2-cron.yml
@@ -165,7 +165,8 @@ jobs:
 
       - name: Install ginkgo
         run: |
-          go install github.com/onsi/ginkgo/v2/ginkgo@v2.12.0
+          GINKGO_VERSION=$(cd test/e2e && go list -m  -mod=readonly  -f {{.Version}}  github.com/onsi/ginkgo/v2)
+          go install github.com/onsi/ginkgo/v2/ginkgo@$GINKGO_VERSION
           sudo cp ~/go/bin/ginkgo /usr/local/bin
 
       - name: cache
diff --git a/.github/workflows/e2e-test-ci.yml b/.github/workflows/e2e-test-ci.yml
index d30a358743..96e10eb84b 100644
--- a/.github/workflows/e2e-test-ci.yml
+++ b/.github/workflows/e2e-test-ci.yml
@@ -168,7 +168,8 @@ jobs:
 
       - name: Install ginkgo
         run: |
-          go install github.com/onsi/ginkgo/v2/ginkgo@v2.12.0
+          GINKGO_VERSION=$(cd test/e2e && go list -m  -mod=readonly  -f {{.Version}}  github.com/onsi/ginkgo/v2)
+          go install github.com/onsi/ginkgo/v2/ginkgo@$GINKGO_VERSION
           sudo cp ~/go/bin/ginkgo /usr/local/bin
 
       - name: cache
diff --git a/.github/workflows/k8s-timer-ci.yml b/.github/workflows/k8s-timer-ci.yml
index ae511673a2..c4f8925fbb 100644
--- a/.github/workflows/k8s-timer-ci.yml
+++ b/.github/workflows/k8s-timer-ci.yml
@@ -150,7 +150,8 @@ jobs:
 
       - name: Install ginkgo
         run: |
-          go install github.com/onsi/ginkgo/v2/ginkgo@v2.12.0
+          GINKGO_VERSION=$(cd test/e2e && go list -m  -mod=readonly  -f {{.Version}}  github.com/onsi/ginkgo/v2)
+          go install github.com/onsi/ginkgo/v2/ginkgo@$GINKGO_VERSION
           sudo cp ~/go/bin/ginkgo /usr/local/bin
 
       - name: cache
diff --git a/Makefile b/Makefile
index 9e246842cc..cc75666717 100644
--- a/Makefile
+++ b/Makefile
@@ -154,7 +154,7 @@ e2e-test-local: kind-up e2e-test
 .PHONY: ginkgo-check
 ginkgo-check:
 ifeq ("$(wildcard $(GINKGO))", "")
-	@echo "ERROR: Need to install ginkgo first, run: go get -u github.com/onsi/ginkgo/v2/ginkgo@v2.9.2 or go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@v2.9.2"
+	@echo "ERROR: Need to install ginkgo first, run: go get -u github.com/onsi/ginkgo/v2/ginkgo or go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo"
 	exit 1
 endif