Browse Source

Fix master builds on mips* again (#815)

* Use local folder for xgo

* Always do crosscompile and testing to fail early

* Added mips* values for boltdb

In order to get master building again I have applied these 2 additional
files to boltdb. This should get dropped when
https://github.com/boltdb/bolt/issues/656 gets solved.
Thomas Boerger 2 years ago
parent
commit
ea8c8cdaf3

+ 5 - 6
.drone.yml

@@ -35,7 +35,7 @@ pipeline:
35 35
     commands:
36 36
       - make test-mysql
37 37
     when:
38
-      event: [ push ]
38
+      event: [ push, tag, pull_request ]
39 39
 
40 40
   test-pgsql:
41 41
     image: webhippie/golang:edge
@@ -47,7 +47,7 @@ pipeline:
47 47
     commands:
48 48
       - make test-pgsql
49 49
     when:
50
-      event: [ push ]
50
+      event: [ push, tag, pull_request ]
51 51
 
52 52
   updater:
53 53
     image: karalabe/xgo-latest:latest
@@ -59,8 +59,7 @@ pipeline:
59 59
     commands:
60 60
       - make release
61 61
     when:
62
-      event: [ push, tag ]
63
-      branch: [ master, release/*, refs/tags/* ]
62
+      event: [ push, tag, pull_request ]
64 63
 
65 64
   coverage:
66 65
     image: plugins/coverage
@@ -140,11 +139,11 @@ services:
140 139
       - MYSQL_DATABASE=test
141 140
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
142 141
     when:
143
-      event: [ push ]
142
+      event: [ push, tag, pull_request ]
144 143
 
145 144
   pgsql:
146 145
     image: postgres:9.5
147 146
     environment:
148 147
       - POSTGRES_DB=test
149 148
     when:
150
-      event: [ push ]
149
+      event: [ push, tag, pull_request ]

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


+ 1 - 1
Makefile

@@ -108,7 +108,7 @@ release-build:
108 108
 	@which xgo > /dev/null; if [ $$? -ne 0 ]; then \
109 109
 		go get -u github.com/karalabe/xgo; \
110 110
 	fi
111
-	xgo -dest $(DIST)/binaries -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -targets '$(TARGETS)' -out $(EXECUTABLE)-$(VERSION) $(IMPORT)
111
+	xgo -dest $(DIST)/binaries -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -targets '$(TARGETS)' -out $(EXECUTABLE)-$(VERSION) .
112 112
 ifeq ($(CI),drone)
113 113
 	mv /build/* $(DIST)/binaries
114 114
 endif

+ 8 - 0
vendor/github.com/boltdb/bolt/bolt_mips64.go

@@ -0,0 +1,8 @@
1
+// +build mips64
2
+package bolt
3
+
4
+// maxMapSize represents the largest mmap size supported by Bolt.
5
+const maxMapSize = 0xFFFFFFFFFFFF // 256TB
6
+
7
+// maxAllocSize is the size used when creating array pointers.
8
+const maxAllocSize = 0x7FFFFFFF

+ 8 - 0
vendor/github.com/boltdb/bolt/bolt_mips64le.go

@@ -0,0 +1,8 @@
1
+// +build mips64le
2
+package bolt
3
+
4
+// maxMapSize represents the largest mmap size supported by Bolt.
5
+const maxMapSize = 0xFFFFFFFFFFFF // 256TB
6
+
7
+// maxAllocSize is the size used when creating array pointers.
8
+const maxAllocSize = 0x7FFFFFFF