From a7e4c51380c42dd89b127f5e5f9be7b54020bc6b Mon Sep 17 00:00:00 2001 From: Ashwin Bhat Date: Mon, 24 Nov 2025 20:57:33 -0500 Subject: [PATCH] fix: use cross-platform timeout for Claude Code installation (#700) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The GNU `timeout` command is not available on macOS. Check if it exists and use it when available, otherwise run without timeout. Also extracts the version into a CLAUDE_CODE_VERSION variable for easier maintenance. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Claude --- action.yml | 13 ++++++++----- base-action/action.yml | 13 ++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/action.yml b/action.yml index 62d44e6..72d8183 100644 --- a/action.yml +++ b/action.yml @@ -191,20 +191,23 @@ runs: # Install Claude Code if no custom executable is provided if [ -z "${{ inputs.path_to_claude_code_executable }}" ]; then - echo "Installing Claude Code..." + CLAUDE_CODE_VERSION="2.0.50" + echo "Installing Claude Code v${CLAUDE_CODE_VERSION}..." for attempt in 1 2 3; do echo "Installation attempt $attempt..." - if timeout 120 bash -c 'curl -fsSL https://claude.ai/install.sh | bash -s -- 2.0.50'; then - echo "Claude Code installed successfully" - break + if command -v timeout &> /dev/null; then + timeout 120 bash -c "curl -fsSL https://claude.ai/install.sh | bash -s -- $CLAUDE_CODE_VERSION" && break + else + curl -fsSL https://claude.ai/install.sh | bash -s -- "$CLAUDE_CODE_VERSION" && break fi if [ $attempt -eq 3 ]; then echo "Failed to install Claude Code after 3 attempts" exit 1 fi - echo "Installation timed out or failed, retrying..." + echo "Installation failed, retrying..." sleep 5 done + echo "Claude Code installed successfully" echo "$HOME/.local/bin" >> "$GITHUB_PATH" else echo "Using custom Claude Code executable: ${{ inputs.path_to_claude_code_executable }}" diff --git a/base-action/action.yml b/base-action/action.yml index 7ebfb64..955b876 100644 --- a/base-action/action.yml +++ b/base-action/action.yml @@ -117,20 +117,23 @@ runs: shell: bash run: | if [ -z "${{ inputs.path_to_claude_code_executable }}" ]; then - echo "Installing Claude Code..." + CLAUDE_CODE_VERSION="2.0.50" + echo "Installing Claude Code v${CLAUDE_CODE_VERSION}..." for attempt in 1 2 3; do echo "Installation attempt $attempt..." - if timeout 120 bash -c 'curl -fsSL https://claude.ai/install.sh | bash -s -- 2.0.50'; then - echo "Claude Code installed successfully" - break + if command -v timeout &> /dev/null; then + timeout 120 bash -c "curl -fsSL https://claude.ai/install.sh | bash -s -- $CLAUDE_CODE_VERSION" && break + else + curl -fsSL https://claude.ai/install.sh | bash -s -- "$CLAUDE_CODE_VERSION" && break fi if [ $attempt -eq 3 ]; then echo "Failed to install Claude Code after 3 attempts" exit 1 fi - echo "Installation timed out or failed, retrying..." + echo "Installation failed, retrying..." sleep 5 done + echo "Claude Code installed successfully" else echo "Using custom Claude Code executable: ${{ inputs.path_to_claude_code_executable }}" # Add the directory containing the custom executable to PATH