From adee91eb79d478462173be2441df636d59a46323 Mon Sep 17 00:00:00 2001
From: Sven Rebhan <srebhan@influxdata.com>
Date: Fri, 8 Dec 2023 18:01:57 +0100
Subject: [PATCH] More fixes

---
 .circleci/config.yml | 55 +++++++++++++++++++++++++++++---------------
 1 file changed, 37 insertions(+), 18 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 645e36095b7d9..b49a5a3a9dce5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -24,6 +24,25 @@ commands:
   check-changed-files-or-halt:
     steps:
       - run: ./scripts/check-file-changes.sh
+  test-go-arch:
+    parameters:
+      os:
+        type: string
+        default: "linux"
+      arch:
+        type: string
+        default: "amd64"
+    steps:
+      - unless:
+          condition:
+            or:
+              - equal: [ "386", << parameters.arch >> ]
+              - equal: [ "darwin", << parameters.os >> ]
+          steps:
+            - run: echo 'export RACE="-race"' >> $BASH_ENV
+      - run:
+          name: "Testing << parameters.os >> << parameters.arch >>"
+          command: GOOS=<< parameters.os >> GOARCH=<< parameters.arch >> ./gotestsum -- -short -race -cover -coverprofile=coverage.out ./...
   test-go:
     parameters:
       os:
@@ -245,18 +264,18 @@ jobs:
       - run: ./scripts/install_gotestsum.sh linux gotestsum
       - attach_workspace:
           at: '/go'
-      - run:
-          name: "Testing linux amd64"
-          command: GOOS=linux GOARCH=amd64 ./gotestsum -- -short -race -cover -coverprofile=coverage.out ./...
-      - run:
-          name: "Testing linux 386"
-          command: GOOS=linux GOARCH=386 ./gotestsum -- -short -cover -coverprofile=coverage.out ./...
-      - run:
-          name: "Testing darwin arm64"
-          command: GOOS=dawin GOARCH=arm64 ./gotestsum -- -short -race -cover -coverprofile=coverage.out ./...
-      - run:
-          name: "Testing windows"
-          command: GOOS=windows GOARCH=amd64 ./gotestsum -- -short -race -cover -coverprofile=coverage.out ./...
+      - test-go-arch:
+          os: linux
+          arch: "386"
+      - test-go-arch:
+          os: linux
+          arch: amd64
+      - test-go-arch:
+          os: darwin
+          arch: arm64
+      - test-go-arch:
+          os: windows
+          arch: amd64
       - save_cache:
           name: "Save Go caches"
           key: go-caches-<< parameters.cache_version >>-linux-amd64-go<< parameters.goversion >>-{{ checksum "go.sum" }}
@@ -351,9 +370,9 @@ jobs:
       - restore_cache:
           name: "Restore Go caches"
           key: go-caches-<< parameters.cache_version >>-darwin-arm64-go<< parameters.goversion >>-{{ checksum "go.sum" }}
-      - test-go:
-          os: darwin
-          arch: arm64
+      # - test-go:
+      #     os: darwin
+      #     arch: arm64
       - save_cache:
           name: "Save Go caches"
           key: go-caches-<< parameters.cache_version >>-darwin-arm64-go<< parameters.goversion >>-{{ checksum "go.sum" }}
@@ -378,9 +397,9 @@ jobs:
       - restore_cache:
           name: "Restore Go caches"
           key: go-caches-<< parameters.cache_version >>-windows-amd64-go<< parameters.goversion >>-{{ checksum "go.sum" }}
-      - test-go:
-          os: windows
-          gotestsum: "gotestsum.exe"
+      # - test-go:
+      #     os: windows
+      #     gotestsum: "gotestsum.exe"
       - save_cache:
           name: "Save Go caches"
           key: go-caches-<< parameters.cache_version >>-windows-amd64-go<< parameters.goversion >>-{{ checksum "go.sum" }}