fix(ios): fix pod install in pure mode and consolidate test summaries

abueide · claude · abueide · commit c7aa09c54d60 · 2026-02-19T18:34:09.000-06:00
Fix two bugs that cause CocoaPods/xcodebuild failures in devbox --pure:

1. Set LANG=en_US.UTF-8 in iOS plugin.json so Ruby's unicode_normalize
   doesn't crash with Encoding::CompatibilityError in pure mode.

2. Fix devbox_omit_nix_env() premature flag bug: DEVBOX_OMIT_NIX_ENV_APPLIED
   was set before resolving the devbox binary, so if resolution failed the
   flag blocked all retries and Darwin cleanup (CC, DEVELOPER_DIR, SDKROOT)
   never ran. Move flag to end of function and move Darwin cleanup outside
   the devbox_bin gate so it runs unconditionally.

3. Remove ios_xcodebuild() wrapper — devbox_omit_nix_env() is the single
   source of truth for Nix env cleanup. All call sites now use xcodebuild
   directly.

4. Replace 3 duplicate test-summary.sh scripts with test-framework.sh in
   all 6 E2E YAML files, unifying reporting between unit and E2E tests.

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/examples/android/tests/test-suite.yaml b/examples/android/tests/test-suite.yaml
@@ -106,7 +106,14 @@ processes:
 
   # Summary - always runs, checks marker file for pass/fail
   summary:
-    command: "bash tests/test-summary.sh 'Android E2E Test Suite' 'reports/android-e2e-logs' 'reports/.e2e-passed'"
+    command: |
+      set -e
+      export REPO_ROOT="$(cd ../.. && pwd)"
+      . "$REPO_ROOT/plugins/tests/test-framework.sh"
+      log_test "Android E2E Test Suite"
+      assert_file_exists "reports/.e2e-passed" "E2E pipeline completed"
+      rm -f reports/.e2e-passed
+      test_summary "android-e2e"
     depends_on:
       cleanup-app:
         condition: process_completed
diff --git a/examples/android/tests/test-summary.sh b/examples/android/tests/test-summary.sh
diff --git a/examples/ios/tests/test-suite.yaml b/examples/ios/tests/test-suite.yaml
@@ -113,7 +113,14 @@ processes:
 
   # Summary - always runs, checks marker file for pass/fail
   summary:
-    command: "bash tests/test-summary.sh 'iOS E2E Test Suite' 'reports/ios-e2e-logs' 'reports/.e2e-passed'"
+    command: |
+      set -e
+      export REPO_ROOT="$(cd ../.. && pwd)"
+      . "$REPO_ROOT/plugins/tests/test-framework.sh"
+      log_test "iOS E2E Test Suite"
+      assert_file_exists "reports/.e2e-passed" "E2E pipeline completed"
+      rm -f reports/.e2e-passed
+      test_summary "ios-e2e"
     depends_on:
       cleanup:
         condition: process_completed
diff --git a/examples/ios/tests/test-summary.sh b/examples/ios/tests/test-summary.sh
diff --git a/examples/react-native/tests/test-suite-all-e2e.yaml b/examples/react-native/tests/test-suite-all-e2e.yaml
@@ -280,7 +280,14 @@ processes:
 
   # Summary - always runs, checks marker file for pass/fail
   summary:
-    command: "bash tests/test-summary.sh 'React Native All Platforms E2E Test Suite' 'reports/react-native-all-e2e-logs' 'reports/.e2e-passed'"
+    command: |
+      set -e
+      export REPO_ROOT="$(cd ../.. && pwd)"
+      . "$REPO_ROOT/plugins/tests/test-framework.sh"
+      log_test "React Native All Platforms E2E Test Suite"
+      assert_file_exists "reports/.e2e-passed" "E2E pipeline completed"
+      rm -f reports/.e2e-passed
+      test_summary "rn-all-e2e"
     depends_on:
       cleanup:
         condition: process_completed
diff --git a/examples/react-native/tests/test-suite-android-e2e.yaml b/examples/react-native/tests/test-suite-android-e2e.yaml
@@ -157,7 +157,14 @@ processes:
 
   # Summary - always runs, checks marker file for pass/fail
   summary:
-    command: "bash tests/test-summary.sh 'React Native Android E2E Test Suite' 'reports/react-native-android-e2e-logs' 'reports/.e2e-passed'"
+    command: |
+      set -e
+      export REPO_ROOT="$(cd ../.. && pwd)"
+      . "$REPO_ROOT/plugins/tests/test-framework.sh"
+      log_test "React Native Android E2E Test Suite"
+      assert_file_exists "reports/.e2e-passed" "E2E pipeline completed"
+      rm -f reports/.e2e-passed
+      test_summary "rn-android-e2e"
     depends_on:
       cleanup:
         condition: process_completed
diff --git a/examples/react-native/tests/test-suite-ios-e2e.yaml b/examples/react-native/tests/test-suite-ios-e2e.yaml
@@ -5,8 +5,6 @@ environment:
   - "SUITE_NAME=rn-ios-e2e"
   - "ANDROID_SKIP_SETUP=1"
   - "TEST_TUI=${TEST_TUI:-false}"
-  - "LANG=en_US.UTF-8"
-  - "LC_ALL=en_US.UTF-8"
   - "REACT_NATIVE_VIRTENV=${REACT_NATIVE_VIRTENV}"
 
 log_location: "reports/react-native-ios-e2e-logs"
@@ -164,7 +162,14 @@ processes:
 
   # Summary - always runs, checks marker file for pass/fail
   summary:
-    command: "bash tests/test-summary.sh 'React Native iOS E2E Test Suite' 'reports/react-native-ios-e2e-logs' 'reports/.e2e-passed'"
+    command: |
+      set -e
+      export REPO_ROOT="$(cd ../.. && pwd)"
+      . "$REPO_ROOT/plugins/tests/test-framework.sh"
+      log_test "React Native iOS E2E Test Suite"
+      assert_file_exists "reports/.e2e-passed" "E2E pipeline completed"
+      rm -f reports/.e2e-passed
+      test_summary "rn-ios-e2e"
     depends_on:
       cleanup:
         condition: process_completed
diff --git a/examples/react-native/tests/test-suite-web-e2e.yaml b/examples/react-native/tests/test-suite-web-e2e.yaml
@@ -124,7 +124,14 @@ processes:
 
   # Summary - always runs, checks marker file for pass/fail
   summary:
-    command: "bash tests/test-summary.sh 'React Native Web E2E Test Suite' 'reports/react-native-web-e2e-logs' 'reports/.e2e-passed'"
+    command: |
+      set -e
+      export REPO_ROOT="$(cd ../.. && pwd)"
+      . "$REPO_ROOT/plugins/tests/test-framework.sh"
+      log_test "React Native Web E2E Test Suite"
+      assert_file_exists "reports/.e2e-passed" "E2E pipeline completed"
+      rm -f reports/.e2e-passed
+      test_summary "rn-web-e2e"
     depends_on:
       cleanup:
         condition: process_completed
diff --git a/examples/react-native/tests/test-summary.sh b/examples/react-native/tests/test-summary.sh
diff --git a/plugins/ios/REFERENCE.md b/plugins/ios/REFERENCE.md
@@ -197,9 +197,7 @@ Use this in `devbox.json` build scripts instead of manually stripping Nix flags:
 }
 ```
 
-Also available as the `ios_xcodebuild()` shell function (from `platform/core.sh`) for use within plugin scripts.
-
-> **Note:** Since the iOS init hook now strips Nix compilation variables (`LD`, `LDFLAGS`, `NIX_LDFLAGS`, `NIX_CFLAGS_COMPILE`, `NIX_CFLAGS_LINK`) at shell startup, `xcodebuild` works natively in devbox shell without the wrapper. The `ios.sh xcodebuild` wrapper and `ios_xcodebuild()` function are kept for backward compatibility and use outside devbox shell.
+The iOS init hook (`devbox_omit_nix_env()`) strips Nix compilation variables at shell startup, so `xcodebuild` works natively in devbox shell. The `ios.sh xcodebuild` subcommand forwards directly to `xcodebuild`.
 
 ### Run App
 
diff --git a/plugins/ios/plugin.json b/plugins/ios/plugin.json
@@ -18,7 +18,8 @@
     "IOS_DERIVED_DATA_PATH": "{{ .Virtenv }}/DerivedData",
     "IOS_XCODE_ENV_PATH": "",
     "IOS_RUNTIME_DIR": "{{ .Virtenv }}/runtime",
-    "REPORTS_DIR": "reports"
+    "REPORTS_DIR": "reports",
+    "LANG": "en_US.UTF-8"
   },
   "packages": {
     "bash": "latest",
diff --git a/plugins/ios/virtenv/scripts/domain/build.sh b/plugins/ios/virtenv/scripts/domain/build.sh
@@ -257,5 +257,5 @@ ios_build() {
   # Append the action (build, test, etc.)
   set -- "$@" "$_action"
 
-  ios_xcodebuild "$@"
+  xcodebuild "$@"
 }
diff --git a/plugins/ios/virtenv/scripts/domain/deploy.sh b/plugins/ios/virtenv/scripts/domain/deploy.sh
@@ -142,7 +142,7 @@ ios_resolve_app_via_xcodebuild() {
   fi
 
   # Query build settings with matching DerivedData path
-  _settings="$(ios_xcodebuild "$_xc_flag" "$_xc_proj" -scheme "$_xc_scheme" \
+  _settings="$(xcodebuild "$_xc_flag" "$_xc_proj" -scheme "$_xc_scheme" \
     -configuration Debug -destination 'generic/platform=iOS Simulator' \
     -derivedDataPath "$_xc_derived_data" \
     -showBuildSettings 2>/dev/null || true)"
diff --git a/plugins/ios/virtenv/scripts/platform/core.sh b/plugins/ios/virtenv/scripts/platform/core.sh
@@ -99,34 +99,6 @@ ios_resolve_developer_dir() {
   return 1
 }
 
-# ============================================================================
-# Xcode Build Wrapper
-# ============================================================================
-
-# Safety-net wrapper for xcodebuild that strips residual Nix stdenv variables.
-# devbox_omit_nix_env() handles the main cleanup at shell init via
-# `devbox shellenv --omit-nix-env=true`. This wrapper catches any edge cases
-# where Nix variables leak through (e.g., subshells, process-compose processes
-# that don't go through the full init chain).
-# Args: all arguments are forwarded to xcodebuild
-ios_xcodebuild() {
-  (
-    # Remove Nix linker/compiler variables that break Xcode builds
-    unset LD LDFLAGS NIX_LDFLAGS NIX_CFLAGS_COMPILE NIX_CFLAGS_LINK
-    unset NIX_CC NIX_CXX NIX_ENFORCE_PURITY NIX_HARDENING_ENABLE
-    unset NIX_CC_WRAPPER_TARGET_HOST_x86_64_apple_darwin
-    unset NIX_CC_WRAPPER_TARGET_HOST_aarch64_apple_darwin
-    unset AR NM RANLIB STRIP STRINGS SIZE
-    unset SDKROOT MACOSX_DEPLOYMENT_TARGET
-    unset configureFlags depsBuildBuild depsBuildHost
-    # Ensure system compiler is used
-    CC=/usr/bin/clang
-    CXX=/usr/bin/clang++
-    export CC CXX
-    xcodebuild "$@"
-  )
-}
-
 # ============================================================================
 # Devbox Binary Resolution
 # ============================================================================
@@ -170,37 +142,38 @@ devbox_omit_nix_env() {
     return 0
   fi
 
-  export DEVBOX_OMIT_NIX_ENV_APPLIED=1
-  devbox_bin="$(ios_resolve_devbox_bin 2>/dev/null || true)"
-  if [ -z "$devbox_bin" ]; then
-    ios_log_debug "devbox not found; skipping omit-nix-env setup."
-    return 0
-  fi
-
   devbox_init_path="${DEVBOX_INIT_PATH:-}"
-  devbox_bin_dir="$(dirname "$devbox_bin")"
+  devbox_bin_dir=""
   devbox_project_bin=""
-  if [ -n "${DEVBOX_PROJECT_ROOT:-}" ] && [ -d "${DEVBOX_PROJECT_ROOT}/.devbox/bin" ]; then
-    devbox_project_bin="${DEVBOX_PROJECT_ROOT}/.devbox/bin"
-  elif [ -n "${DEVBOX_WD:-}" ] && [ -d "${DEVBOX_WD}/.devbox/bin" ]; then
-    devbox_project_bin="${DEVBOX_WD}/.devbox/bin"
-  fi
 
-  devbox_config_path=""
-  if [ -n "${DEVBOX_CONFIG:-}" ] && [ -f "$DEVBOX_CONFIG" ]; then
-    devbox_config_path="$DEVBOX_CONFIG"
-  elif [ -n "${DEVBOX_CONFIG_PATH:-}" ] && [ -f "$DEVBOX_CONFIG_PATH" ]; then
-    devbox_config_path="$DEVBOX_CONFIG_PATH"
-  elif [ -n "${DEVBOX_CONFIG_DIR:-}" ] && [ -f "${DEVBOX_CONFIG_DIR%/}/devbox.json" ]; then
-    devbox_config_path="${DEVBOX_CONFIG_DIR%/}/devbox.json"
-  fi
+  devbox_bin="$(ios_resolve_devbox_bin 2>/dev/null || true)"
+  if [ -n "$devbox_bin" ]; then
+    devbox_bin_dir="$(dirname "$devbox_bin")"
+    if [ -n "${DEVBOX_PROJECT_ROOT:-}" ] && [ -d "${DEVBOX_PROJECT_ROOT}/.devbox/bin" ]; then
+      devbox_project_bin="${DEVBOX_PROJECT_ROOT}/.devbox/bin"
+    elif [ -n "${DEVBOX_WD:-}" ] && [ -d "${DEVBOX_WD}/.devbox/bin" ]; then
+      devbox_project_bin="${DEVBOX_WD}/.devbox/bin"
+    fi
+
+    devbox_config_path=""
+    if [ -n "${DEVBOX_CONFIG:-}" ] && [ -f "$DEVBOX_CONFIG" ]; then
+      devbox_config_path="$DEVBOX_CONFIG"
+    elif [ -n "${DEVBOX_CONFIG_PATH:-}" ] && [ -f "$DEVBOX_CONFIG_PATH" ]; then
+      devbox_config_path="$DEVBOX_CONFIG_PATH"
+    elif [ -n "${DEVBOX_CONFIG_DIR:-}" ] && [ -f "${DEVBOX_CONFIG_DIR%/}/devbox.json" ]; then
+      devbox_config_path="${DEVBOX_CONFIG_DIR%/}/devbox.json"
+    fi
 
-  if [ -n "$devbox_config_path" ]; then
-    eval "$("$devbox_bin" --config "$devbox_config_path" shellenv --install --no-refresh-alias --omit-nix-env=true)"
+    if [ -n "$devbox_config_path" ]; then
+      eval "$("$devbox_bin" --config "$devbox_config_path" shellenv --install --no-refresh-alias --omit-nix-env=true)"
+    else
+      eval "$("$devbox_bin" shellenv --install --no-refresh-alias --omit-nix-env=true)"
+    fi
   else
-    eval "$("$devbox_bin" shellenv --install --no-refresh-alias --omit-nix-env=true)"
+    ios_log_debug "devbox not found; skipping shellenv eval (Darwin cleanup still runs)."
   fi
 
+  # Darwin cleanup — runs unconditionally (even if devbox binary not found)
   if [ "$(uname -s)" = "Darwin" ]; then
     if [ -x /usr/bin/clang ]; then
       CC=/usr/bin/clang
@@ -220,6 +193,7 @@ devbox_omit_nix_env() {
     unset SDKROOT
   fi
 
+  # Re-add preserved paths
   if [ -n "$devbox_init_path" ]; then
     PATH="${devbox_init_path}:${PATH}"
   fi
@@ -230,6 +204,9 @@ devbox_omit_nix_env() {
     PATH="${devbox_bin_dir}:${PATH}"
   fi
   export PATH
+
+  # Flag set AFTER all cleanup succeeds
+  export DEVBOX_OMIT_NIX_ENV_APPLIED=1
 }
 
 # Setup macOS system PATH and DEVELOPER_DIR
diff --git a/plugins/ios/virtenv/scripts/user/ios.sh b/plugins/ios/virtenv/scripts/user/ios.sh

Original file line number	Diff line number	Diff line change
@@ -197,9 +197,7 @@ Use this in `devbox.json` build scripts instead of manually stripping Nix flags:
`197`	`197`	`}`
`198`	`198`	```
`199`	`199`
`200`		-Also available as the `ios_xcodebuild()` shell function (from `platform/core.sh`) for use within plugin scripts.
`201`		`-`
`202`		-> Note: Since the iOS init hook now strips Nix compilation variables (`LD`, `LDFLAGS`, `NIX_LDFLAGS`, `NIX_CFLAGS_COMPILE`, `NIX_CFLAGS_LINK`) at shell startup, `xcodebuild` works natively in devbox shell without the wrapper. The `ios.sh xcodebuild` wrapper and `ios_xcodebuild()` function are kept for backward compatibility and use outside devbox shell.
	`200`	+The iOS init hook (`devbox_omit_nix_env()`) strips Nix compilation variables at shell startup, so `xcodebuild` works natively in devbox shell. The `ios.sh xcodebuild` subcommand forwards directly to `xcodebuild`.
`203`	`201`
`204`	`202`	`### Run App`
`205`	`203`