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): support Bash 3 release builds (#6738)

r33drichards5cc7b093f02a
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 f5a38582b2..2b6456d19c 100755
--- a/libs/fleet/terraform-provider-fleets/scripts/build-release-archive.sh
+++ b/libs/fleet/terraform-provider-fleets/scripts/build-release-archive.sh
@@ -25,7 +25,6 @@ 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")"
@@ -37,15 +36,19 @@ else
target_dir_for_tools="$target_dir"
fi
+cargo_args=(rustc --locked)
+cargo_args+=(--manifest-path "$native_root_for_tools/Cargo.toml")
+cargo_args+=(--package cyclops-sdk --release)
target_release_dir="$target_dir_for_tools/release"
if [ -n "$rust_target" ]; then
- cargo_target_args=(--target "$rust_target")
+ cargo_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
+cargo_args+=(--target-dir "$target_dir_for_tools")
case "$goos" in
linux|darwin)
@@ -70,13 +73,7 @@ mkdir -p "$dist_dir"
build_log="$(mktemp)"
trap 'rm -f "$build_log"' EXIT
-CARGO_TERM_COLOR=never cargo rustc \
- --locked \
- --manifest-path "$native_root_for_tools/Cargo.toml" \
- --package cyclops-sdk \
- --release \
- "${cargo_target_args[@]}" \
- --target-dir "$target_dir_for_tools" \
+CARGO_TERM_COLOR=never cargo "${cargo_args[@]}" \
-- \
--crate-type staticlib \
--print native-static-libs 2>&1 | tee "$build_log"
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 a690e40a32..55d6bc91a4 100755
--- a/libs/fleet/terraform-provider-fleets/scripts/test-release-contract.sh
+++ b/libs/fleet/terraform-provider-fleets/scripts/test-release-contract.sh
@@ -53,7 +53,6 @@ require "terraform-provider-fleets_\${VERSION}_SHA256SUMS.sig" "$workflow"
require "gh release create \"v\$VERSION\"" "$workflow"
require 'CARGO_TERM_COLOR=never' "$builder"
-require 'cargo rustc' "$builder"
require '--crate-type staticlib' "$builder"
require '--print native-static-libs' "$builder"
require 'windows_linker_flags' "$builder"
@@ -61,7 +60,10 @@ 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_args=(rustc --locked)' "$builder"
+require "cargo_args+=(--target \"\$rust_target\")" "$builder"
+require "cargo \"\${cargo_args[@]}\"" "$builder"
+reject "\"\${cargo_target_args[@]}\"" "$builder"
require "CARGO_TARGET_\${rust_target_env}_LINKER" "$builder"
require "CC_\${rust_target//-/_}" "$builder"
require 'libcyclops_sdk.a' "$builder"