DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #9336 from longwuyuan/fix-multiple-ginkgo-versions

Browse source 
fixed multiple ginkgo versions
This commit is contained in:
James Strong 2022-11-24 20:13:19 -05:00 committed by GitHub
commit 04ce92338e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/run-in-docker.sh
View file

@ -77,7 +77,7 @@ if [[ "$DOCKER_IN_DOCKER_ENABLED" == "true" ]]; then
echo "FLAGS=$FLAGS"
go env
set -x
go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@v2.1.4
go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@v2.5.1
find / -type f -name ginkgo 2>/dev/null
which ginkgo
/bin/bash -c "${FLAGS}"

2
images/test-runner/rootfs/Dockerfile
View file

@ -49,7 +49,7 @@ ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
RUN go install github.com/onsi/ginkgo/v2/ginkgo@v2.1.4 && go install golang.org/x/lint/golint@latest
RUN go install github.com/onsi/ginkgo/v2/ginkgo@v2.5.1 && go install golang.org/x/lint/golint@latest
ARG RESTY_CLI_VERSION
ARG RESTY_CLI_SHA

2
test/e2e/run-chart-test.sh
View file

@ -78,7 +78,7 @@ fi
if [ "${SKIP_IMAGE_CREATION:-false}" = "false" ]; then
if ! command -v ginkgo &> /dev/null; then
go get github.com/onsi/ginkgo/v2/ginkgo@v2.1.4
go get github.com/onsi/ginkgo/v2/ginkgo@v2.5.1
fi
echo "[dev-env] building image"
make -C ${DIR}/../../ clean-image build image

2
test/e2e/run.sh
View file

@ -79,7 +79,7 @@ fi
if [ "${SKIP_IMAGE_CREATION:-false}" = "false" ]; then
if ! command -v ginkgo &> /dev/null; then
go get github.com/onsi/ginkgo/v2/ginkgo@v2.1.4
go get github.com/onsi/ginkgo/v2/ginkgo@v2.5.1
fi
echo "[dev-env] building image"