From 671250d2733199ce6bcb722b477862afb5af8237 Mon Sep 17 00:00:00 2001
From: Cody Soyland <cody@soyland.org>
Date: Fri, 13 Nov 2020 09:42:42 -0600
Subject: [PATCH 1/4] Update Go version for CVE-2020-28362, use param matrix

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index baac1dea4..43528b67a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -192,49 +192,17 @@ workflows:
           requires:
             - setup
       - test:
-          name: test-golang-1.15
-          resource_class: xlarge
-          golang_version: 1.15.3
-          requires:
-            - setup
-          filters:
-            tags:
-              only: /^v.*/
+        name: test-golang-<< matrix.golang_version >>
+        resource_class: large
+        matrix:
+          parameters:
+            golang_version: ["1.14.12", "1.15.5"]
       - test:
-          name: test-golang-1.14.10
-          resource_class: xlarge
-          golang_version: 1.14.10
-          requires:
-            - setup
-          filters:
-            tags:
-              only: /^v.*/
-      # Ideally we would do something like the following instead of the above,
-      # but we don't like having point releases in the CI run name. Maybe in
-      # the future we can go back to this:
-      #- test:
-      #  name: test-golang-<< matrix.golang_version >>
-      #  matrix:
-      #    parameters:
-      #      golang_version: ["1.14.10", "1.15.3"]
-      - test:
-          name: test-race
-          test_make_target: test-race
-          resource_class: xlarge
-          requires:
-            - setup
-      - test:
-          name: test-txstore-rbf
-          test_make_target: test-txstore-rbf
-          resource_class: xlarge
-          requires:
-            - setup
-      - test:
-          name: test-txstore-rbf_lmdb
-          test_make_target: test-txstore-rbf_lmdb
-          resource_class: xlarge
-          requires:
-            - setup            
+        name: << matrix.test_make_target >>
+        resource_class: xlarge
+        matrix:
+          parameters:
+            test_make_target: ["test-race", "test-txstore-rbf", "test-txstore-rbf_lmdb"]
       - test:
           name: test-shardwidth-22
           shard_width: "22"

From dca606dea88ef53dc7eddbce9b38ba7a7cdeb2f8 Mon Sep 17 00:00:00 2001
From: Cody Soyland <cody@soyland.org>
Date: Fri, 13 Nov 2020 09:43:08 -0600
Subject: [PATCH 2/4] Add pilosa (binary build) to .gitignore

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 84fdc73f4..6e553c794 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,5 @@ build
 lattice
 release-pilosa-fsck.*.*.tar.gz
 /log.*
-/tourna.log.*
\ No newline at end of file
+/tourna.log.*
+pilosa

From a2f49b6a84f9b7e038ccf773c4ef97732c67ff80 Mon Sep 17 00:00:00 2001
From: Cody Soyland <cody@soyland.org>
Date: Fri, 13 Nov 2020 09:57:23 -0600
Subject: [PATCH 3/4] Fix yaml syntax, add requires section

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 43528b67a..b757ceb23 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -192,23 +192,29 @@ workflows:
           requires:
             - setup
       - test:
-        name: test-golang-<< matrix.golang_version >>
-        resource_class: large
-        matrix:
-          parameters:
-            golang_version: ["1.14.12", "1.15.5"]
+          name: test-golang-<< matrix.golang_version >>
+          resource_class: large
+          context: molecula
+          requires:
+            - setup
+          matrix:
+            parameters:
+              golang_version: ["1.14.12", "1.15.5"]
       - test:
-        name: << matrix.test_make_target >>
-        resource_class: xlarge
-        matrix:
-          parameters:
-            test_make_target: ["test-race", "test-txstore-rbf", "test-txstore-rbf_lmdb"]
+          name: << matrix.test_make_target >>
+          resource_class: xlarge
+          context: molecula
+          requires:
+            - setup
+          matrix:
+            parameters:
+              test_make_target: ["test-race", "test-txstore-rbf", "test-txstore-rbf_lmdb"]
       - test:
           name: test-shardwidth-22
           shard_width: "22"
           resource_class: large
           requires:
-            - setup            
+            - setup
       - cluster-tests:
           requires:
             - setup

From e53b74261b2b008c069dd31acfe4bdcd7dbcfc7b Mon Sep 17 00:00:00 2001
From: Cody Soyland <cody@soyland.org>
Date: Fri, 13 Nov 2020 10:04:24 -0600
Subject: [PATCH 4/4] Update default Go version

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

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b757ceb23..699be66ac 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,7 +5,7 @@ executors:
     parameters:
       version:
         type: string
-        default: "1.14.10"
+        default: "1.15.5"
       resource_class:
         type: string
         default: medium
@@ -84,7 +84,7 @@ jobs:
         default: medium
       golang_version:
         type: string
-        default: "1.14.10"
+        default: "1.15.5"
       shard_width:
         type: string
         default: "20"
@@ -222,7 +222,7 @@ workflows:
           requires:
             - linter
             - check-license-headers
-            - test-golang-1.14.10
+            - test-golang-1.15.5
       - dockerhub-upload-unstable:
           context: molecula
           requires: