Fix Claude env rustup setup guard (#65)

Co-authored-by: attune-tuna[bot] <259745507+attune-tuna[bot]@users.noreply.github.com>
Co-authored-by: Jessica Black <jess@attunehq.com>
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>

Author: 3 people

.github/workflows/release.yml

@@ -164,12 +164,34 @@ jobs:
                   tool: cargo-cross
                   checksum: true
 
+            # The cc/ort build scripts bake the active Xcode clang-runtime path
+            # (where libclang_rt.osx.a lives, e.g. .../clang/17/lib/darwin) into
+            # the cached build output. The Rust cache key keys on target, rustc,
+            # and the lockfile but not on the toolchain, so when macos-latest
+            # rolls to a new Xcode a restored cache links against a path that no
+            # longer exists, failing with "library 'clang_rt.osx' not found".
+            # Fold the Xcode/clang version into the cache key (via env-vars
+            # below) so a toolchain roll invalidates the stale cache.
+            - name: Record macOS toolchain version for cache key
+              if: runner.os == 'macOS'
+              run: |
+                  {
+                    echo "MACOS_TOOLCHAIN_KEY<<EOF"
+                    xcodebuild -version 2>/dev/null || true
+                    clang --version | head -n1
+                    echo EOF
+                  } >> "$GITHUB_ENV"
+
             - name: Setup Rust cache
               uses: Swatinem/rust-cache@v2
               with:
                   # PRs exercise the release matrix early; main-branch dry runs
                   # warm the default-branch cache that tag releases can restore.
                   shared-key: release-${{ matrix.target }}-embeddings-${{ matrix.embeddings }}
+                  # Hash the active Xcode/clang version into the macOS cache key
+                  # so a runner-image toolchain roll busts the cache instead of
+                  # restoring a build that links against a stale clang path.
+                  env-vars: "MACOS_TOOLCHAIN_KEY"
 
             - name: Build with cargo cross
               if: matrix.cross

scripts/setup-claude-env.sh

@@ -36,16 +36,40 @@ apt_install() {
   $SUDO DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends "$@"
 }
 
+install_rustup() {
+  log "Installing Rust (stable)"
+  curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
+    | sh -s -- -y --default-toolchain stable --profile minimal
+}
+
+load_cargo_env() {
+  if [ -f "$HOME/.cargo/env" ]; then
+    # shellcheck disable=SC1091
+    . "$HOME/.cargo/env"
+  elif [ -d "$HOME/.cargo/bin" ]; then
+    export PATH="$HOME/.cargo/bin:$PATH"
+  fi
+}
+
 log "Installing system build dependencies"
 apt_install git build-essential pkg-config ca-certificates curl
 
+if ! command -v rustup >/dev/null 2>&1; then
+  install_rustup
+fi
+load_cargo_env
+
 if ! command -v cargo >/dev/null 2>&1; then
-  log "Installing Rust (stable)"
-  curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
-    | sh -s -- -y --default-toolchain stable --profile minimal
+  log "Installing Rust stable toolchain"
+  rustup toolchain install stable --profile minimal
+  rustup default stable
+  load_cargo_env
+fi
+
+if ! command -v cargo >/dev/null 2>&1; then
+  warn "cargo is still unavailable after Rust setup"
+  exit 1
 fi
-# shellcheck disable=SC1091
-. "$HOME/.cargo/env"
 
 log "Ensuring nightly rustfmt is available (used by 'cargo +nightly fmt')"
 rustup toolchain install nightly --profile minimal --component rustfmt >/dev/null 2>&1 \