Cleanups

influxdata · Oct 23, 2023 · ce8272c · ce8272c
1 parent c747f0b
commit ce8272c
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 17 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -47,15 +47,21 @@ commands:
           condition:
             equal: [ windows, << parameters.os >> ]
           steps:
-            - run: rm -rf '/c/Program Files/Go'
-            - run: rm -rf '/c/ProgramData/chocolatey/lib/mingw'
+            - run:
+                name: Remove Go and MinGW to avoid clashes after upgrade during cache restore
+                command: |
+                  rm -rf '/c/Program Files/Go'
+                  rm -rf '/c/ProgramData/chocolatey/lib/mingw'
       - when:
           condition:
             equal: [ darwin, << parameters.os >> ]
           steps:
-            - run: rm -rf '/usr/local/Cellar/go'
-            - run: sudo mkdir -p '/usr/local/Cellar/go'
-            - run: sudo chown -R $(id -u):$(id -g) '/usr/local/Cellar/go'
+            - run:
+                name: Ensure go directory is empty and have proper permissions before cache restore
+                command: |
+                  sudo rm -rf '/usr/local/Cellar/go'
+                  sudo mkdir -p '/usr/local/Cellar/go'
+                  sudo chown -R $(id -u):$(id -g) '/usr/local/Cellar/go'
       - restore_cache:
           name: "Restore binaries from cache"
           key: go-bins-<< parameters.cache_version >>-<< parameters.os >>-<< parameters.arch >>-go<< parameters.goversion >>-{{ checksum "go.sum" }}
@@ -117,10 +123,18 @@ commands:
             equal: [ "386", << parameters.arch >> ]
           steps:
             - run: echo 'export RACE="-race"' >> $BASH_ENV
-      - run: |
-          export PATH="/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin:$PATH"
-          echo "PATH: $PATH"
-          GOARCH=<< parameters.arch >> ./<< parameters.gotestsum >> -- ${RACE} -short -cover -coverprofile=coverage.out ./...
+      - when:
+          condition:
+            equal: [ windows, << parameters.os >> ]
+          steps:
+            - run: |
+                export PATH="/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin:$PATH"
+                GOARCH=<< parameters.arch >> ./<< parameters.gotestsum >> -- ${RACE} -short -cover -coverprofile=coverage.out ./...
+      - unless:
+          condition:
+            equal: [ windows, << parameters.os >> ]
+          steps:
+            - run: GOARCH=<< parameters.arch >> ./<< parameters.gotestsum >> -- ${RACE} -short -cover -coverprofile=coverage.out ./...
       - when:
           condition:
             and:

diff --git a/scripts/installgo_linux.sh b/scripts/installgo_linux.sh
@@ -33,4 +33,4 @@ fi
 
 echo "$PATH"
 command -v go
-go version
+go version
diff --git a/scripts/installgo_mac.sh b/scripts/installgo_mac.sh
@@ -47,5 +47,6 @@ else
     setup_go
 fi
 
+echo "$PATH"
 command -v go
 go version
diff --git a/scripts/installgo_windows.sh b/scripts/installgo_windows.sh
@@ -20,5 +20,6 @@ else
     setup_go
 fi
 
+echo "$PATH"
 command -v go
 go version
diff --git a/scripts/installmingw_windows.sh b/scripts/installmingw_windows.sh
@@ -1,19 +1,16 @@
 #!/bin/sh
 
-set -ux
+set -eux
 
 MINGW_VERSION="12.2.0.03042023"
 GCC_VERSION="12.2.0"
 
 setup_mingw () {
-    choco upgrade mingw --allow-downgrade --force --version=${MINGW_VERSION} --verbose --debug
+    choco upgrade mingw --allow-downgrade --force --version=${MINGW_VERSION}
 }
 
 export PATH="/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin:$PATH"
-
-echo "PATH: $PATH"
-command -v gcc
-gcc -dumpversion
+echo "$PATH"
 
 if command -v gcc >/dev/null 2>&1; then
     echo "MinGW is already installed"
@@ -26,6 +23,6 @@ else
     setup_mingw
 fi
 
-echo "PATH: $PATH"
+echo "$PATH"
 command -v gcc
 gcc -dumpversion