Merge remote-tracking branch 'origin/main' into bump-gomega-ginkgo-v2

Signed-off-by: Sunjay Bhatia <[email protected]>
projectcontour · Oct 6, 2021 · ea17a70 · ea17a70
2 parents 0a8162e + 88d678b
commit ea17a70
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/hack/actions/install-kubernetes-toolchain.sh b/hack/actions/install-kubernetes-toolchain.sh
@@ -51,7 +51,11 @@ echo "Installing Kubernetes toolchain..."
 
 # Install ginkgo CLI
 if [[ ${GITHUB_ACTIONS} == "true" && ${OS} == "linux" ]]; then
+<<<<<<< HEAD
   go install github.com/onsi/ginkgo/ginkgo@ver2
+=======
+  go install github.com/onsi/ginkgo/...
+>>>>>>> origin/main
   mv /home/runner/go/bin/ginkgo ${DESTDIR}/ginkgo
 fi