File tree Expand file tree Collapse file tree 3 files changed +5
-79
lines changed
Expand file tree Collapse file tree 3 files changed +5
-79
lines changed Original file line number Diff line number Diff line change @@ -301,8 +301,8 @@ jobs:
301301
302302 - name : Prepare environment
303303 run : |
304- # ginkgo with fixes
305- go build github.com/flant /ginkgo/ginkgo
304+ # note that onsi/ ginkgo is replaced by flant/ginkgo with fixes for combining coverage
305+ go build github.com/onsi /ginkgo/ginkgo
306306 ./ginkgo version
307307 echo ::set-env name=KIND_CLUSTER_VERSION::${{ matrix.k8s_version }}
308308
Original file line number Diff line number Diff line change @@ -3,7 +3,6 @@ module github.com/flant/shell-operator
33go 1.12
44
55require (
6- github.com/flant/ginkgo v1.11.1-0.20200206071017-2216da3b016c // fix_coverage_combining
76 github.com/flant/libjq-go v1.0.1-0.20200205115921-27e93c18c17f // downgrade jq to 1.6
87 github.com/go-chi/chi v4.0.3+incompatible
98 github.com/go-openapi/errors v0.19.2
@@ -20,7 +19,6 @@ require (
2019 github.com/sirupsen/logrus v1.4.2
2120 github.com/stretchr/testify v1.4.0
2221 golang.org/x/sys v0.0.0-20200113162924-86b910548bc1
23- golang.org/x/tools v0.0.0-20190617190820-da514acc4774
2422 gopkg.in/alecthomas/kingpin.v2 v2.2.6
2523 gopkg.in/robfig/cron.v2 v2.0.0-20150107220207-be2e0b0deed5
2624 gopkg.in/satori/go.uuid.v1 v1.2.0
@@ -35,6 +33,8 @@ require (
3533// replace github.com/go-openapi/validate => ../go-openapi-validate
3634replace github.com/go-openapi/validate => github.com/flant/go-openapi-validate v0.19.4-0.20190926112101-38fbca4ac77f // branch: fix_in_body
3735
36+ replace github.com/onsi/ginkgo v1.11.0 => github.com/flant/ginkgo v1.11.1-0.20200206071017-2216da3b016c // fix_coverage_combining
37+
3838// replace github.com/flant/libjq-go => ../libjq-go
3939
4040// version from k8s.io/client-go
You can’t perform that action at this time.
0 commit comments