From ce59aa102e8e4687c14204a76fe64008be4fa5a1 Mon Sep 17 00:00:00 2001
From: Cody Soyland <cody@soyland.org>
Date: Tue, 17 Sep 2019 12:58:35 -0500
Subject: [PATCH 1/5] Update CirleCI build with Go 1.13 and run enterprise
 tests

---
 .circleci/config.yml | 42 +++++++++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c7fe6e11b..d16202a05 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 defaults: &defaults
   working_directory: /go/src/github.com/pilosa/pilosa
   docker:
-    - image: circleci/golang:1.12
+    - image: circleci/golang:1.13
   environment:
     GO111MODULE: "on"
 fast-checkout: &fast-checkout
@@ -44,19 +44,19 @@ jobs:
       - run: make build GOOS=linux GOARCH=arm GOARM=6
       - run: make build GOOS=linux GOARCH=arm GOARM=7
       - run: make build GOOS=linux GOARCH=arm64
-  test-golang-1.12: &base-test
+  test-golang-1.13: &base-test
     <<: *defaults
     steps:
       - *fast-checkout
       - run: sudo apt-get install lsof
       - run: make test
-  test-golang-1.12-shard22: &base-test
+  test-golang-1.13-shard22:
     <<: *defaults
     steps:
       - *fast-checkout
       - run: sudo apt-get install lsof
       - run: make test SHARD_WIDTH=22
-  test-golang-1.12-race:
+  test-golang-1.13-race:
     <<: *defaults
     steps:
       - *fast-checkout
@@ -64,11 +64,25 @@ jobs:
       - run:
           command: make test TESTFLAGS="-race -v -timeout=30m"
           no_output_timeout: 30m
-  test-golang-1.12-386:
+  test-golang-1.13-386:
     <<: *base-test
     environment:
       GO111MODULE: "on"
       GOARCH: 386
+  test-golang-1.13-enterprise:
+    <<: *defaults
+    steps:
+      - *fast-checkout
+      - run: sudo apt-get install lsof
+      - run: make test ENTERPRISE=1
+  test-golang-1.12:
+    <<: *defaults
+    docker:
+      - image: circleci/golang:1.12
+    steps:
+      - *fast-checkout
+      - run: sudo apt-get install lsof
+      - run: make test
   test-golang-1.11:
     <<: *defaults
     docker:
@@ -135,15 +149,21 @@ workflows:
       - test-build-arm:
           requires:
             - setup
+      - test-golang-1.13-enterprise:
+          requires:
+            - setup
+      - test-golang-1.13-race:
+          requires:
+            - setup
+      - test-golang-1.13-386:
+          requires:
+            - setup
+      - test-golang-1.13:
+          requires:
+            - setup
       - test-golang-1.12:
           requires:
             - setup
-      - test-golang-1.12-race:
-          requires:
-            - setup
-      - test-golang-1.12-386:
-          requires:
-            - setup
       - test-golang-1.11:
           requires:
             - setup

From f8f9d0e3d160da8b320ca44c66c51f237bebf2de Mon Sep 17 00:00:00 2001
From: Cody Soyland <cody@soyland.org>
Date: Tue, 17 Sep 2019 13:33:54 -0500
Subject: [PATCH 2/5] Update golangci-lint

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d16202a05..159ad545e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -33,7 +33,7 @@ jobs:
     <<: *defaults
     steps:
       - *fast-checkout
-      - run: curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.13.2
+      - run: curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.18.0
       - run: sudo cp bin/golangci-lint /usr/local/bin/
       - run: make golangci-lint
   test-build-arm:

From 8e208569e8e775041d0dc1b7ff40203320279c0d Mon Sep 17 00:00:00 2001
From: Cody Soyland <cody@soyland.org>
Date: Tue, 17 Sep 2019 13:34:28 -0500
Subject: [PATCH 3/5] Remove build tag that break enterprise build

---
 roaring/unmarshal_binary.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/roaring/unmarshal_binary.go b/roaring/unmarshal_binary.go
index 6b13cce0f..86f30df0b 100644
--- a/roaring/unmarshal_binary.go
+++ b/roaring/unmarshal_binary.go
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build !enterprise
-
 package roaring
 
 import (

From aa7030a646d307a402ddabef2b83800034dd3916 Mon Sep 17 00:00:00 2001
From: Cody Soyland <cody@soyland.org>
Date: Tue, 17 Sep 2019 13:40:05 -0500
Subject: [PATCH 4/5] Update Go version in Circle dependencies

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 159ad545e..b29eb0f32 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -174,12 +174,12 @@ workflows:
           requires:
             - linter
             - check-license-headers
-            - test-golang-1.12
+            - test-golang-1.13
       - release:
           requires:
             - linter
             - check-license-headers
-            - test-golang-1.12
+            - test-golang-1.13
           filters:
             tags:
               only: /^v.*/
@@ -192,4 +192,4 @@ workflows:
           requires:
             - linter
             - check-license-headers
-            - test-golang-1.12
+            - test-golang-1.13

From 3db1a91fa0fe822ad99636fadc3ab1557ac08631 Mon Sep 17 00:00:00 2001
From: Cody Soyland <cody@soyland.org>
Date: Tue, 17 Sep 2019 13:40:16 -0500
Subject: [PATCH 5/5] Add minimum Go version to go.mod

---
 go.mod | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/go.mod b/go.mod
index 883b3ca9e..e8a9ae2cc 100644
--- a/go.mod
+++ b/go.mod
@@ -43,3 +43,5 @@ require (
 	modernc.org/mathutil v1.0.0
 	modernc.org/strutil v1.0.0
 )
+
+go 1.11