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): align Windows Rust and Go ABIs (#6737)

r33drichardsef5d830c78b4
diff --git a/libs/fleet/terraform-provider-fleets/.github/workflows/release.yml b/libs/fleet/terraform-provider-fleets/.github/workflows/release.yml
index 5d4eccce07..f4daa5d1a7 100644
--- a/libs/fleet/terraform-provider-fleets/.github/workflows/release.yml
+++ b/libs/fleet/terraform-provider-fleets/.github/workflows/release.yml
@@ -66,11 +66,13 @@ jobs:
runner: windows-2022
cc: x86_64-w64-mingw32-clang
llvm_mingw_host: x86_64
+ rust_target: x86_64-pc-windows-gnu
- goos: windows
goarch: arm64
runner: windows-11-arm
cc: aarch64-w64-mingw32-clang
llvm_mingw_host: aarch64
+ rust_target: aarch64-pc-windows-gnullvm
steps:
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5
@@ -79,6 +81,10 @@ jobs:
- uses: dtolnay/rust-toolchain@2c7215f132e9ebf062739d9130488b56d53c060c # 1.97.0
with:
toolchain: "1.97.0"
+ - name: Install Windows Rust target
+ if: matrix.goos == 'windows'
+ shell: bash
+ run: rustup target add "${{ matrix.rust_target }}"
- name: Install llvm-mingw
if: matrix.goos == 'windows'
shell: bash
@@ -95,6 +101,7 @@ jobs:
test -n "$toolchain_bin"
go_build_cc="$(cygpath -m "$toolchain_bin/${{ matrix.cc }}.exe")"
echo "GO_BUILD_CC=$go_build_cc" >> "$GITHUB_ENV"
+ echo "RUST_TARGET=${{ matrix.rust_target }}" >> "$GITHUB_ENV"
- name: Configure release compiler
if: matrix.goos != 'windows'
shell: bash
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 e819cb67c8..f5a38582b2 100755
--- a/libs/fleet/terraform-provider-fleets/scripts/build-release-archive.sh
+++ b/libs/fleet/terraform-provider-fleets/scripts/build-release-archive.sh
@@ -24,6 +24,8 @@ target_dir="${CYCLOPS_SDK_TARGET_DIR:-${RUNNER_TEMP:-${TMPDIR:-/tmp}}/terraform-
goos="$(go env GOOS)"
goarch="$(go env GOARCH)"
go_build_cc="${GO_BUILD_CC:-$(go env CC)}"
+rust_target="${RUST_TARGET:-}"
+cargo_target_args=()
if [ "$goos" = windows ] && command -v cygpath >/dev/null 2>&1; then
native_root_for_tools="$(cygpath -m "$native_root")"
@@ -35,13 +37,27 @@ else
target_dir_for_tools="$target_dir"
fi
+target_release_dir="$target_dir_for_tools/release"
+if [ -n "$rust_target" ]; then
+ cargo_target_args=(--target "$rust_target")
+ target_release_dir="$target_dir_for_tools/$rust_target/release"
+ rust_target_env="${rust_target^^}"
+ rust_target_env="${rust_target_env//-/_}"
+ export "CARGO_TARGET_${rust_target_env}_LINKER=$go_build_cc"
+ export "CC_${rust_target//-/_}=$go_build_cc"
+fi
+
case "$goos" in
linux|darwin)
- static_library="$target_dir_for_tools/release/deps/libcyclops_sdk.a"
+ static_library="$target_release_dir/deps/libcyclops_sdk.a"
executable="terraform-provider-fleets_v${version}"
;;
windows)
- static_library="$target_dir_for_tools/release/deps/cyclops_sdk.lib"
+ if [ -n "$rust_target" ]; then
+ static_library="$target_release_dir/deps/libcyclops_sdk.a"
+ else
+ static_library="$target_release_dir/deps/cyclops_sdk.lib"
+ fi
executable="terraform-provider-fleets_v${version}.exe"
;;
*)
@@ -59,6 +75,7 @@ CARGO_TERM_COLOR=never cargo rustc \
--manifest-path "$native_root_for_tools/Cargo.toml" \
--package cyclops-sdk \
--release \
+ "${cargo_target_args[@]}" \
--target-dir "$target_dir_for_tools" \
-- \
--crate-type staticlib \
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 9bfb88e032..a690e40a32 100755
--- a/libs/fleet/terraform-provider-fleets/scripts/test-release-contract.sh
+++ b/libs/fleet/terraform-provider-fleets/scripts/test-release-contract.sh
@@ -38,6 +38,9 @@ require 'runner: windows-11-arm' "$workflow"
require 'LLVM_MINGW_VERSION: "20260616"' "$workflow"
require 'x86_64-w64-mingw32-clang' "$workflow"
require 'aarch64-w64-mingw32-clang' "$workflow"
+require 'rust_target: x86_64-pc-windows-gnu' "$workflow"
+require 'rust_target: aarch64-pc-windows-gnullvm' "$workflow"
+require "rustup target add \"\${{ matrix.rust_target }}\"" "$workflow"
require 'Install llvm-mingw' "$workflow"
require "cygpath -m \"\$toolchain_bin/\${{ matrix.cc }}.exe\"" "$workflow"
require "echo \"GO_BUILD_CC=\$go_build_cc\" >> \"\$GITHUB_ENV\"" "$workflow"
@@ -57,5 +60,10 @@ 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 "rust_target=\"\${RUST_TARGET:-}\"" "$builder"
+require "cargo_target_args=(--target \"\$rust_target\")" "$builder"
+require "CARGO_TARGET_\${rust_target_env}_LINKER" "$builder"
+require "CC_\${rust_target//-/_}" "$builder"
+require 'libcyclops_sdk.a' "$builder"
require 'CGO_ENABLED=1' "$builder"
require "terraform-provider-fleets_\${version}_\${goos}_\${goarch}.zip" "$builder"