Refactor CircleCI config for version 2.1

.circleci/config.yml

@@ -1,13 +1,10 @@
-# CircleCI 2.0 configuration file
+---
-# Check https://circleci.com/docs/2.0/language-go/ for more details
 version: 2.1
-
 parameters:
   primary_image:
     type: string
-    default: 'rqlite/circleci-primary:0.0.12'
+    default: rqlite/circleci-primary:0.0.12
-
+commands:
-commands: # a reusable command with parameters
   restore_and_save_cache:
     steps:
       - restore_cache:
@@ -17,8 +14,7 @@ commands: # a reusable command with parameters
       - save_cache:
           key: go-mod-v4-{{ checksum "go.sum" }}
           paths:
-            - "/home/circleci/go/pkg/mod"
+            - /home/circleci/go/pkg/mod
-
   cross_compile:
     parameters:
       cc:
@@ -32,27 +28,23 @@ commands: # a reusable command with parameters
     steps:
       - run: go version
       - run:
-          name: "Cross compile using <<parameters.cc>>"
+          name: Cross compile using <<parameters.cc>>
           command: go install -a ./...
           environment:
             CGO_ENABLED: 1
             GOARCH: <<parameters.goarch>>
             GOOS: <<parameters.goos>>
             CC: <<parameters.cc>>
-
 jobs:
   lint:
     docker:
       - image: << pipeline.parameters.primary_image >>
     steps:
-      # Don't do a restore_cache here, so we regularly check that the Go
-      # modules are actually fetchable.
       - checkout
       - run: go version
       - run: test -z "$(gofmt -l . | tee /dev/stderr)"
       - run: go vet ./...
     resource_class: large
-
   test_odd:
     docker:
       - image: << pipeline.parameters.primary_image >>
@@ -61,7 +53,6 @@ jobs:
       - restore_and_save_cache
       - run: go test -failfast $(go list ./... | sed -n 'n;p')
     resource_class: large
-
   test_odd_race:
     docker:
       - image: << pipeline.parameters.primary_image >>
@@ -71,9 +62,8 @@ jobs:
       - run:
           command: go test -v -failfast -timeout 20m -race $(go list ./... | sed -n 'n;p')
           environment:
-            GORACE: "halt_on_error=1"
+            GORACE: halt_on_error=1
     resource_class: large
-
   test_even:
     docker:
       - image: << pipeline.parameters.primary_image >>
@@ -82,7 +72,6 @@ jobs:
       - restore_and_save_cache
       - run: go test -failfast $(go list ./... | sed -n 'p;n')
     resource_class: large
-
   test_even_race:
     docker:
       - image: << pipeline.parameters.primary_image >>
@@ -92,9 +81,8 @@ jobs:
       - run:
           command: go test -v -failfast -timeout 20m -race $(go list ./... | sed -n 'p;n')
           environment:
-            GORACE: "halt_on_error=1"
+            GORACE: halt_on_error=1
     resource_class: large
-
   cross_compile_windows:
     docker:
       - image: << pipeline.parameters.primary_image >>
@@ -168,7 +156,6 @@ jobs:
           cc: mips64el-linux-gnuabi64-gcc
           goarch: mips64le
     resource_class: large
-
   end_to_end_single:
     docker:
       - image: << pipeline.parameters.primary_image >>
@@ -182,7 +169,6 @@ jobs:
           environment:
             RQLITED_PATH: /home/circleci/go/bin/rqlited
     resource_class: large
-
   end_to_end_upgrade:
     docker:
       - image: << pipeline.parameters.primary_image >>
@@ -197,7 +183,6 @@ jobs:
           environment:
             RQLITED_PATH: /home/circleci/go/bin/rqlited
     resource_class: large
-
   end_to_end_joining:
     docker:
       - image: << pipeline.parameters.primary_image >>
@@ -210,7 +195,6 @@ jobs:
           environment:
             RQLITED_PATH: /home/circleci/go/bin/rqlited
     resource_class: large
-
   end_to_end_multi:
     docker:
       - image: << pipeline.parameters.primary_image >>
@@ -223,7 +207,6 @@ jobs:
           environment:
             RQLITED_PATH: /home/circleci/go/bin/rqlited
     resource_class: large
-
   end_to_end_multi_adv:
     docker:
       - image: << pipeline.parameters.primary_image >>
@@ -236,7 +219,6 @@ jobs:
           environment:
             RQLITED_PATH: /home/circleci/go/bin/rqlited
     resource_class: large
-
   end_to_end_autoclustering:
     docker:
       - image: << pipeline.parameters.primary_image >>
@@ -251,7 +233,6 @@ jobs:
           environment:
             RQLITED_PATH: /home/circleci/go/bin/rqlited
     resource_class: large
-
   end_to_end_auto_state:
     docker:
       - image: << pipeline.parameters.primary_image >>
@@ -259,7 +240,7 @@ jobs:
         name: minio
         command: server /data
     environment:
-        RQLITED_PATH: /home/circleci/go/bin/rqlited
+      RQLITED_PATH: /home/circleci/go/bin/rqlited
     steps:
       - checkout
       - restore_and_save_cache
@@ -275,10 +256,9 @@ jobs:
             MINIO_BUCKET: minio-bucket
       - run:
           command: python3 system_test/e2e/auto_state_file.py
-      -run:
+      - run:
           command: python3 system_test/e2e/auto_state_gcs.py
     resource_class: large
-
   end_to_end_cdc:
     docker:
       - image: << pipeline.parameters.primary_image >>
@@ -291,7 +271,6 @@ jobs:
           environment:
             RQLITED_PATH: /home/circleci/go/bin/rqlited
     resource_class: large
-
   end_to_end_extensions:
     docker:
       - image: << pipeline.parameters.primary_image >>
@@ -301,11 +280,16 @@ jobs:
       - run: go install ./...
       - run: mkdir /home/circleci/extensions
       - run: mkdir /home/circleci/extensions-misc
-      - run: gcc -g -fPIC -shared db/testdata/rot13.c -o /home/circleci/extensions/rot13.so
+      - run: gcc -g -fPIC -shared db/testdata/rot13.c -o
-      - run: gcc -g -fPIC -shared db/testdata/carray.c -o /home/circleci/extensions/carray.so
+          /home/circleci/extensions/rot13.so
+      - run: gcc -g -fPIC -shared db/testdata/carray.c -o
+          /home/circleci/extensions/carray.so
       - run: zip -j /home/circleci/rot13.zip /home/circleci/extensions/rot13.so
-      - run: tar -czf /home/circleci/rot13.tar.gz --strip-components=1 -C /home/circleci/extensions rot13.so
+      - run: tar -czf /home/circleci/rot13.tar.gz --strip-components=1 -C
-      - run: git clone https://github.com/rqlite/rqlite-sqlite-ext.git && cd rqlite-sqlite-ext/misc && make && cp *.so /home/circleci/extensions-misc
+          /home/circleci/extensions rot13.so
+      - run: git clone https://github.com/rqlite/rqlite-sqlite-ext.git && cd
+          rqlite-sqlite-ext/misc && make && cp *.so
+          /home/circleci/extensions-misc
       - run:
           command: python3 system_test/e2e/extensions.py
           environment:
@@ -317,7 +301,6 @@ jobs:
             EXTENSIONS_PATH_MULTIPLE: /home/circleci/rot13.zip,/home/circleci/extensions/carray.so
             EXTENSIONS_PATH_MISC: /home/circleci/extensions-misc
     resource_class: large
-
 workflows:
   version: 2
   build_and_test: