fix ginko versions (apache#1983)

goodrain · Sep 28, 2023 · d2b6f93 · d2b6f93
1 parent bca0d1d
commit d2b6f93
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git 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/[email protected]
+          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
@@ -165,7 +165,8 @@ jobs:
 
       - name: Install ginkgo
         run: |
-          go install github.com/onsi/ginkgo/v2/[email protected]
+          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
@@ -168,7 +168,8 @@ jobs:
 
       - name: Install ginkgo
         run: |
-          go install github.com/onsi/ginkgo/v2/[email protected]
+          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
@@ -150,7 +150,8 @@ jobs:
 
       - name: Install ginkgo
         run: |
-          go install github.com/onsi/ginkgo/v2/[email protected]
+          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
@@ -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