Skip to content

Commit 8675032

Browse files
Cherrgzeripath
authored andcommitted
workaround broken drone build (#7362)
* workaround broken swagger only master brach is not working, latest release seems to work Signed-off-by: Michael Gnehr <[email protected]> * make vendor Signed-off-by: Michael Gnehr <[email protected]> * Don't export GO111MODULE * set go-swagger to fixed release version mentioned here: #7362 (comment) Signed-off-by: Michael Gnehr <[email protected]>
1 parent 49ee9d2 commit 8675032

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+3033
-2478
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ generate:
102102
.PHONY: generate-swagger
103103
generate-swagger:
104104
@hash swagger > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
105-
$(GO) get -u github.com/go-swagger/go-swagger/cmd/swagger; \
105+
GO111MODULE="on" $(GO) get -u github.com/go-swagger/go-swagger/cmd/swagger@v0.19.0; \
106106
fi
107107
swagger generate spec -o './$(SWAGGER_SPEC)'
108108
$(SED_INPLACE) '$(SWAGGER_SPEC_S_TMPL)' './$(SWAGGER_SPEC)'

go.mod

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ require (
1111
github.com/Unknwon/i18n v0.0.0-20171114194641-b64d33658966
1212
github.com/Unknwon/paginater v0.0.0-20151104151617-7748a72e0141
1313
github.com/andybalholm/cascadia v0.0.0-20161224141413-349dd0209470 // indirect
14-
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 // indirect
1514
github.com/bgentry/speakeasy v0.1.0 // indirect
1615
github.com/blevesearch/bleve v0.0.0-20190214220507-05d86ea8f6e3
1716
github.com/blevesearch/blevex v0.0.0-20180227211930-4b158bb555a3 // indirect
@@ -28,7 +27,7 @@ require (
2827
github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 // indirect
2928
github.com/cznic/strutil v0.0.0-20181122101858-275e90344537 // indirect
3029
github.com/denisenkom/go-mssqldb v0.0.0-20190121005146-b04fd42d9952
31-
github.com/dgrijalva/jwt-go v0.0.0-20161101193935-9ed569b5d1ac
30+
github.com/dgrijalva/jwt-go v3.2.0+incompatible
3231
github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712 // indirect
3332
github.com/emirpasic/gods v1.12.0
3433
github.com/etcd-io/bbolt v1.3.2 // indirect
@@ -59,7 +58,6 @@ require (
5958
github.com/go-xorm/xorm v0.7.3-0.20190620151208-f1b4f8368459
6059
github.com/gogits/chardet v0.0.0-20150115103509-2404f7772561
6160
github.com/gogits/cron v0.0.0-20160810035002-7f3990acf183
62-
github.com/gogo/protobuf v1.2.1 // indirect
6361
github.com/google/go-cmp v0.3.0 // indirect
6462
github.com/google/go-github/v24 v24.0.1
6563
github.com/gorilla/context v1.1.1
@@ -83,7 +81,6 @@ require (
8381
github.com/mattn/go-isatty v0.0.7
8482
github.com/mattn/go-oci8 v0.0.0-20190320171441-14ba190cf52d // indirect
8583
github.com/mattn/go-sqlite3 v1.10.0
86-
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
8784
github.com/mcuadros/go-version v0.0.0-20190308113854-92cdf37c5b75
8885
github.com/microcosm-cc/bluemonday v0.0.0-20161012083705-f77f16ffc87a
8986
github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae // indirect
@@ -92,10 +89,7 @@ require (
9289
github.com/oliamb/cutter v0.2.2
9390
github.com/philhofer/fwd v1.0.0 // indirect
9491
github.com/pquerna/otp v0.0.0-20160912161815-54653902c20e
95-
github.com/prometheus/client_golang v0.9.0
96-
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 // indirect
97-
github.com/prometheus/common v0.0.0-20181020173914-7e9e6cabbd39 // indirect
98-
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d // indirect
92+
github.com/prometheus/client_golang v0.9.3
9993
github.com/remyoudompheng/bigfft v0.0.0-20190321074620-2f0d2b0e0001 // indirect
10094
github.com/russross/blackfriday v0.0.0-20180428102519-11635eb403ff
10195
github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca // indirect
@@ -134,6 +128,7 @@ require (
134128
gopkg.in/src-d/go-git.v4 v4.12.0
135129
gopkg.in/stretchr/testify.v1 v1.2.2 // indirect
136130
gopkg.in/testfixtures.v2 v2.5.0
131+
gopkg.in/yaml.v2 v2.2.2 // indirect
137132
mvdan.cc/xurls/v2 v2.0.0
138133
strk.kbt.io/projects/go/libravatar v0.0.0-20160628055650-5eed7bff870a
139134
xorm.io/builder v0.3.5

go.sum

Lines changed: 48 additions & 12 deletions
Large diffs are not rendered by default.

vendor/github.com/dgrijalva/jwt-go/README.md

Lines changed: 23 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/dgrijalva/jwt-go/VERSION_HISTORY.md

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/dgrijalva/jwt-go/ecdsa.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/dgrijalva/jwt-go/hmac.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/dgrijalva/jwt-go/parser.go

Lines changed: 65 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/dgrijalva/jwt-go/rsa.go

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/dgrijalva/jwt-go/rsa_utils.go

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)