Skip to content

Commit 94ea8f1

Browse files
author
Daniele Rondina
committed
Move to ginkgo/v2
1 parent c745270 commit 94ea8f1

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

Makefile

+4-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ fmt:
2020

2121
.PHONY: test
2222
test:
23-
GO111MODULE=off go get github.com/onsi/ginkgo/ginkgo
23+
GO111MODULE=off go get github.com/onsi/ginkgo/v2/ginkgo
2424
GO111MODULE=off go get github.com/onsi/gomega/...
25-
ginkgo -race -r -flakeAttempts 3 ./...
25+
ginkgo -r -flake-attempts 3 ./...
2626

2727
.PHONY: coverage
2828
coverage:
@@ -43,8 +43,9 @@ deps:
4343
GO111MODULE=off go get golang.org/x/lint/golint
4444
GO111MODULE=off go get github.com/mitchellh/gox
4545
GO111MODULE=off go get golang.org/x/tools/cmd/cover
46-
GO111MODULE=off go get github.com/onsi/ginkgo/ginkgo
46+
GO111MODULE=on go get github.com/onsi/ginkgo/v2/ginkgo
4747
GO111MODULE=off go get github.com/onsi/gomega/...
48+
ginkgo version
4849

4950
.PHONY: build
5051
build:

scripts/ginkgo.coverage.sh

+3-5
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,9 @@ coveragetxt="coverage.txt"
2323

2424

2525
generate_cover_data() {
26-
ginkgo -flakeAttempts=3 -race -failFast -cover -r .
27-
echo "" > ${coveragetxt}
28-
find . -type f -name "*.coverprofile" | while read -r file; do cat "$file" >> ${coveragetxt} && mv "$file" "${coverdir}"; done
29-
echo "mode: $covermode" >"$profile"
30-
grep -h -v "^mode:" "$coverdir"/*.coverprofile >>"$profile"
26+
ginkgo -flake-attempts=3 -fail-fast -cover -r --covermode=atomic .
27+
cp coverprofile.out "$profile"
28+
mv coverprofile.out ${coveragetxt}
3129
}
3230

3331
push_to_coveralls() {

0 commit comments

Comments
 (0)