Browse Source

Check if missing/modified/unused deps in vendor and fix errors (#1468)

* Check if missing deps in vendor

This will catch import from other repos. (maybe by auto-import)

* Remove github.com/smartystreets unused deps

* Remove github.com/boltdb/bolt unused dep

* Fetch github.com/go-xorm/core + sync gopkg.in/ldap.v2/ldap.go

* Auto-install govendor + reinstall github.com/boltdb/bolt needed by vendor/github.com/blevesearch/bleve/index/store/boltdb

* Update go-xorm/xorm to a5cb21 in vendor.json

* Use a custom repo for implementing change to bolt dep.

* Switching bolt to github.com/go-gitea/bolt

* Switching bolt to github.com/go-gitea/bolt (fork version)

* change the drone sign
Antoine GIRARD 2 years ago
parent
commit
eb1075dd4c
6 changed files with 22 additions and 37 deletions
  1. 1 0
      .drone.yml
  2. 1 1
      .drone.yml.sig
  3. 7 0
      Makefile
  4. 2 2
      vendor/github.com/go-xorm/core/dialect.go
  5. 1 1
      vendor/gopkg.in/ldap.v2/ldap.go
  6. 10 33
      vendor/vendor.json

+ 1 - 0
.drone.yml

@@ -19,6 +19,7 @@ pipeline:
19 19
       - make generate
20 20
       - make vet
21 21
       - make lint
22
+      - make test-vendor
22 23
       - make test
23 24
       - make build
24 25
     when:

File diff suppressed because it is too large
+ 1 - 1
.drone.yml.sig


+ 7 - 0
Makefile

@@ -79,6 +79,13 @@ integrations: build
79 79
 test:
80 80
 	for PKG in $(PACKAGES); do go test -cover -coverprofile $$GOPATH/src/$$PKG/coverage.out $$PKG || exit 1; done;
81 81
 
82
+.PHONY: test-vendor
83
+test-vendor:
84
+	@hash govendor > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
85
+		go get -u github.com/kardianos/govendor; \
86
+	fi
87
+	govendor status +outside +unused  || exit 1
88
+
82 89
 .PHONY: test-mysql
83 90
 test-mysql:
84 91
 	@echo "Not integrated yet!"

+ 2 - 2
vendor/github.com/go-xorm/core/dialect.go

@@ -279,9 +279,9 @@ func (b *Base) ForUpdateSql(query string) string {
279 279
 func (b *Base) LogSQL(sql string, args []interface{}) {
280 280
 	if b.logger != nil && b.logger.IsShowSQL() {
281 281
 		if len(args) > 0 {
282
-			b.logger.Info("[sql]", sql, args)
282
+			b.logger.Infof("[SQL] %v %v", sql, args)
283 283
 		} else {
284
-			b.logger.Info("[sql]", sql)
284
+			b.logger.Infof("[SQL] %v", sql)
285 285
 		}
286 286
 	}
287 287
 }

+ 1 - 1
vendor/gopkg.in/ldap.v2/ldap.go

@@ -60,7 +60,7 @@ var ApplicationMap = map[uint8]string{
60 60
 	ApplicationExtendedResponse:      "Extended Response",
61 61
 }
62 62
 
63
-// LDAP Behera Password Policy Draft 10 (https://tools.ietf.org/html/draft-behera-ldap-password-policy-10)
63
+// Ldap Behera Password Policy Draft 10 (https://tools.ietf.org/html/draft-behera-ldap-password-policy-10)
64 64
 const (
65 65
 	BeheraPasswordExpired             = 0
66 66
 	BeheraAccountLocked               = 1

+ 10 - 33
vendor/vendor.json

@@ -257,10 +257,11 @@
257 257
 			"revisionTime": "2016-12-08T13:07:38Z"
258 258
 		},
259 259
 		{
260
-			"checksumSHA1": "J+kVue/HTH4sELlqMO4z0tx9DiA=",
260
+			"checksumSHA1": "26XPwPnOEwZ1COWicbv5xCBY+rg=",
261
+			"origin": "github.com/go-gitea/bolt",
261 262
 			"path": "github.com/boltdb/bolt",
262
-			"revision": "e9cf4fae01b5a8ff89d0ec6b32f0d9c9f79aefdd",
263
-			"revisionTime": "2017-01-31T19:20:18Z"
263
+			"revision": "ccd680d8c1a0179ac3d68f692b01e1a1589cbfc7",
264
+			"revisionTime": "2017-04-20T01:09:17Z"
264 265
 		},
265 266
 		{
266 267
 			"checksumSHA1": "NClRfzxXDSt/g4lM5BIkKhYRVoQ=",
@@ -443,10 +444,10 @@
443 444
 			"revisionTime": "2017-02-16T03:03:40Z"
444 445
 		},
445 446
 		{
446
-			"checksumSHA1": "OCcksAYN5m0kc5yJF/Ba4VVHqeA=",
447
+			"checksumSHA1": "vt2CGANHLNXPAZ01ve3UlsgQ0uU=",
447 448
 			"path": "github.com/go-xorm/core",
448
-			"revision": "e9e84b6f94ace6dec682a39034de56abffb964dd",
449
-			"revisionTime": "2017-02-06T14:57:10Z"
449
+			"revision": "e8409d73255791843585964791443dbad877058c",
450
+			"revisionTime": "2017-03-17T12:25:07Z"
450 451
 		},
451 452
 		{
452 453
 			"checksumSHA1": "k52lEKLp8j5M+jFpe+3u+bIFpxQ=",
@@ -455,10 +456,10 @@
455 456
 			"revisionTime": "2016-08-11T02:11:45Z"
456 457
 		},
457 458
 		{
458
-			"checksumSHA1": "3FEBM0FYERf8jpaResApwcQpr40=",
459
+			"checksumSHA1": "/vlyLLStrbfErk/rR3SPuBGQeqk=",
459 460
 			"path": "github.com/go-xorm/xorm",
460
-			"revision": "7e70eb82224bc950d4fb936036e925a51947c245",
461
-			"revisionTime": "2017-04-02T10:02:47Z"
461
+			"revision": "a5cb21c44305815170d0d72563e47d585e8dcabf",
462
+			"revisionTime": "2017-04-05T10:17:41Z"
462 463
 		},
463 464
 		{
464 465
 			"checksumSHA1": "1ft/4j5MFa7C9dPI9whL03HSUzk=",
@@ -1025,30 +1026,6 @@
1025 1026
 			"revisionTime": "2016-09-18T04:11:01Z"
1026 1027
 		},
1027 1028
 		{
1028
-			"checksumSHA1": "Vzb+dEH/LTYbvr8RXHmt6xJHz04=",
1029
-			"path": "github.com/smartystreets/assertions/internal/go-render/render",
1030
-			"revision": "2063fd1cc7c975db70502811a34b06ad034ccdf2",
1031
-			"revisionTime": "2016-07-07T19:03:55Z"
1032
-		},
1033
-		{
1034
-			"checksumSHA1": "SLC6TfV4icQA9l8YJQu8acJYbuo=",
1035
-			"path": "github.com/smartystreets/assertions/internal/oglematchers",
1036
-			"revision": "2063fd1cc7c975db70502811a34b06ad034ccdf2",
1037
-			"revisionTime": "2016-07-07T19:03:55Z"
1038
-		},
1039
-		{
1040
-			"checksumSHA1": "9LakndErFi5uCXtY1KWl0iRnT4c=",
1041
-			"path": "github.com/smartystreets/goconvey/convey/gotest",
1042
-			"revision": "019319c870f8f1d61dc9c34291abff5cd128b6e8",
1043
-			"revisionTime": "2016-11-03T17:15:00Z"
1044
-		},
1045
-		{
1046
-			"checksumSHA1": "FWDhk37bhAwZ2363D/L2xePwR64=",
1047
-			"path": "github.com/smartystreets/goconvey/convey/reporting",
1048
-			"revision": "019319c870f8f1d61dc9c34291abff5cd128b6e8",
1049
-			"revisionTime": "2016-11-03T17:15:00Z"
1050
-		},
1051
-		{
1052 1029
 			"checksumSHA1": "KE+vv2khbshw+PA9UyHHxd8WKKw=",
1053 1030
 			"origin": "github.com/blevesearch/bleve/vendor/github.com/steveyen/gtreap",
1054 1031
 			"path": "github.com/steveyen/gtreap",