From b90b681af61272c76a9279515bd3cc56f07a34ca Mon Sep 17 00:00:00 2001
From: Brandon Pfeifer <bpfeifer@influxdata.com>
Date: Wed, 22 Nov 2023 17:50:53 -0500
Subject: [PATCH] chore: emit build commands during tests

---
 .circleci/config.yml      | 8 ++++----
 scripts/ci/build-tests.sh | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6d948bda3d3..fda3b514e4d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -376,10 +376,10 @@ jobs:
       - checkout
       - run:
           name: Build test binaries
-          command: |
-            export GOOS=<< parameters.os >>
-            export GOARCH=<< parameters.arch >>
-            ./scripts/ci/build-tests.sh ./test-bin
+          environment:
+            GOOS:   << parameters.os >>
+            GOARCH: << parameters.arch >>
+          command: ./scripts/ci/build-tests.sh ./test-bin
       - persist_to_workspace:
           root: .
           paths:
diff --git a/scripts/ci/build-tests.sh b/scripts/ci/build-tests.sh
index e983a10d480..f2c7e9cdfaf 100755
--- a/scripts/ci/build-tests.sh
+++ b/scripts/ci/build-tests.sh
@@ -20,17 +20,17 @@ function build_linux () {
 
     local -r extld="-fno-PIC -static -Wl,-z,stack-size=8388608"
     CGO_ENABLED=1 PKG_CONFIG=$(which pkg-config) CC="${cc}" go-test-compile \
-        -tags "$tags" -o "${1}/" -ldflags "-extldflags '$extld'" ./...
+        -x -tags "$tags" -o "${1}/" -ldflags "-extldflags '$extld'" ./...
 }
 
 function build_mac () {
     CGO_ENABLED=1 PKG_CONFIG=$(which pkg-config) CC="$(xcc darwin)" go-test-compile \
-        -tags sqlite_foreign_keys,sqlite_json -o "${1}/" ./...
+        -x -tags sqlite_foreign_keys,sqlite_json -o "${1}/" ./...
 }
 
 function build_windows () {
     CGO_ENABLED=1 PKG_CONFIG=$(which pkg-config) CC="$(xcc windows)" go-test-compile \
-        -tags sqlite_foreign_keys,sqlite_json,timetzdata -o "${1}/" ./...
+        -x -tags sqlite_foreign_keys,sqlite_json,timetzdata -o "${1}/" ./...
 }
 
 function build_test_tools () {
@@ -42,7 +42,7 @@ function build_test_tools () {
     cp "/usr/local/bin/gotestsum_$(go env GOOS)_$(go env GOARCH)${ext}" "$1/gotestsum${ext}"
 
     # Build test2json from the installed Go distribution.
-    CGO_ENABLED=0 go build -o "${1}/" -ldflags="-s -w" cmd/test2json
+    CGO_ENABLED=0 go build -x -o "${1}/" -ldflags="-s -w" cmd/test2json
 }
 
 function write_test_metadata () {