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] 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"