feat: Use ldext in build-test.sh (#26082)

devanbenz · web-flow · commit cb5072ce3389 · 2025-03-04T14:45:16.000-06:00
* feat: Use ldext in build-test.sh

* feat: use env vars

* feat: re-add ./... to go-test-compile

* chore: update cross-builder tag

* chore: change cross builder tag to deb10f07f31767ee55b0b5f87edd34635673cf41

* chore: use latest instead of tag

* feat: run ci

* feat: typo in build-tests.sh
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,7 +7,7 @@ orbs:
 parameters:
   cross-container-tag:
     type: string
-    default: go1.23.5-ba67b11de54aa0bf8f1f92a81f786205de8024b6
+    default: go1.23.5-latest
 
   workflow:
     type: string
diff --git a/scripts/ci/build-tests.sh b/scripts/ci/build-tests.sh
@@ -29,9 +29,12 @@ function build_mac () {
 }
 
 function build_windows () {
-    CGO_LDFLAGS="-lntdll -ladvapi32 -lkernel32 -luserenv -lws2_32" \
-    CGO_ENABLED=1 PKG_CONFIG=$(which pkg-config) CC="$(xcc windows)" go-test-compile \
-        -tags sqlite_foreign_keys,sqlite_json,timetzdata -o "${1}/" -x ./...
+  export CC="$(xcc windows)"
+  export CGO_LDFLAGS="-lntdll -ladvapi32 -lkernel32 -luserenv -lws2_32"
+
+  CGO_ENABLED=1 PKG_CONFIG=$(which pkg-config)  go-test-compile \
+        -tags sqlite_foreign_keys,sqlite_json,timetzdata \
+        -ldext "${CC}" -o "${1}/" ./...
 }
 
 function build_test_tools () {

Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,12 @@ function build_mac () {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`function build_windows () {`
`32`		`- CGO_LDFLAGS="-lntdll -ladvapi32 -lkernel32 -luserenv -lws2_32" \`
`33`		`- CGO_ENABLED=1 PKG_CONFIG=$(which pkg-config) CC="$(xcc windows)" go-test-compile \`
`34`		`- -tags sqlite_foreign_keys,sqlite_json,timetzdata -o "${1}/" -x ./...`
	`32`	`+ export CC="$(xcc windows)"`
	`33`	`+ export CGO_LDFLAGS="-lntdll -ladvapi32 -lkernel32 -luserenv -lws2_32"`
	`34`	`+`
	`35`	`+ CGO_ENABLED=1 PKG_CONFIG=$(which pkg-config) go-test-compile \`
	`36`	`+ -tags sqlite_foreign_keys,sqlite_json,timetzdata \`
	`37`	`+ -ldext "${CC}" -o "${1}/" ./...`
`35`	`38`	`}`
`36`	`39`
`37`	`40`	`function build_test_tools () {`