Skip to content

armgit / cua

Public Imported from GitHub
0

Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.

fix(fleets): isolate Go release compiler (#6734)

r33drichardse2541dab7a49
diff --git a/libs/fleet/terraform-provider-fleets/.github/workflows/release.yml b/libs/fleet/terraform-provider-fleets/.github/workflows/release.yml
index 830afa2340..7154214838 100644
--- a/libs/fleet/terraform-provider-fleets/.github/workflows/release.yml
+++ b/libs/fleet/terraform-provider-fleets/.github/workflows/release.yml
@@ -97,7 +97,7 @@ jobs:
- name: Build provider archive
shell: bash
env:
- CC: ${{ matrix.cc }}
+ GO_BUILD_CC: ${{ matrix.cc }}
VERSION: ${{ needs.prepare.outputs.version }}
run: ./scripts/build-release-archive.sh "$VERSION" dist
- name: Upload provider archive
diff --git a/libs/fleet/terraform-provider-fleets/scripts/build-release-archive.sh b/libs/fleet/terraform-provider-fleets/scripts/build-release-archive.sh
index 1d05bf6c2f..e819cb67c8 100755
--- a/libs/fleet/terraform-provider-fleets/scripts/build-release-archive.sh
+++ b/libs/fleet/terraform-provider-fleets/scripts/build-release-archive.sh
@@ -23,6 +23,7 @@ bindings_root="$native_root/sdk-bindings/go-uniffi"
target_dir="${CYCLOPS_SDK_TARGET_DIR:-${RUNNER_TEMP:-${TMPDIR:-/tmp}}/terraform-provider-fleets/cyclops-sdk}"
goos="$(go env GOOS)"
goarch="$(go env GOARCH)"
+go_build_cc="${GO_BUILD_CC:-$(go env CC)}"
if [ "$goos" = windows ] && command -v cygpath >/dev/null 2>&1; then
native_root_for_tools="$(cygpath -m "$native_root")"
@@ -113,6 +114,7 @@ trap 'rm -f "$build_log"; rm -rf "$build_dir"' EXIT
(
cd "$provider_root"
CGO_ENABLED=1 \
+ CC="$go_build_cc" \
CGO_CFLAGS="-I$bindings_root_for_tools/fleet_sdk -I$bindings_root_for_tools/cyclops_sdk_schema" \
CGO_LDFLAGS="$static_library $native_static_libs" \
go build \
diff --git a/libs/fleet/terraform-provider-fleets/scripts/test-release-contract.sh b/libs/fleet/terraform-provider-fleets/scripts/test-release-contract.sh
index d9a04cb077..374c251d85 100755
--- a/libs/fleet/terraform-provider-fleets/scripts/test-release-contract.sh
+++ b/libs/fleet/terraform-provider-fleets/scripts/test-release-contract.sh
@@ -30,6 +30,7 @@ require 'LLVM_MINGW_VERSION: "20260616"' "$workflow"
require 'x86_64-w64-mingw32-clang' "$workflow"
require 'aarch64-w64-mingw32-clang' "$workflow"
require 'Install llvm-mingw' "$workflow"
+require 'GO_BUILD_CC: ${{ matrix.cc }}' "$workflow"
require "./scripts/build-release-archive.sh \"\$VERSION\" dist" "$workflow"
require "terraform-provider-fleets_\${VERSION}_SHA256SUMS" "$workflow"
require 'gpg --batch --armor --detach-sign' "$workflow"
@@ -42,5 +43,7 @@ require '--crate-type staticlib' "$builder"
require '--print native-static-libs' "$builder"
require 'windows_linker_flags' "$builder"
require "cygpath -m \"\$packaged_library\"" "$builder"
+require 'go_build_cc="${GO_BUILD_CC:-$(go env CC)}"' "$builder"
+require 'CC="$go_build_cc"' "$builder"
require 'CGO_ENABLED=1' "$builder"
require "terraform-provider-fleets_\${version}_\${goos}_\${goarch}.zip" "$builder"