This is an automated email from the ASF dual-hosted git repository.
gallardot pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git
The following commit(s) were added to refs/heads/master by this push:
new d2b6f932 fix ginko versions (#1983)
d2b6f932 is described below
commit d2b6f9325659514dd44415bb5d9c80178861f887
Author: Dawid Rogaczewski <[email protected]>
AuthorDate: Thu Sep 28 18:58:22 2023 +0200
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 dd00a7b4..787d632a 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/[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
index 5b2f7ba6..36707fb3 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/[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
index d30a3587..96e10eb8 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/[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
index ae511673..c4f8925f 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/[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
index 9e246842..cc756667 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/[email protected] or go install -mod=mod
github.com/onsi/ginkgo/v2/[email protected]"
+ @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
