From c88b5c67d5a1789761175920fa19dda967145dc1 Mon Sep 17 00:00:00 2001
From: akfoster <ocasta181@gmail.com>
Date: Wed, 5 Feb 2025 23:15:52 -0800
Subject: [PATCH] Fix Changeset Test (#1657)

* should only pass if the PR has a new changeset

* improvements to docs-only check

* add changeset
---
 .changeset/purple-panthers-arrive.md  |  5 +++++
 .github/workflows/check-changeset.yml | 24 +++++++++++-------------
 2 files changed, 16 insertions(+), 13 deletions(-)
 create mode 100644 .changeset/purple-panthers-arrive.md

diff --git a/.changeset/purple-panthers-arrive.md b/.changeset/purple-panthers-arrive.md
new file mode 100644
index 0000000000..c4be31f613
--- /dev/null
+++ b/.changeset/purple-panthers-arrive.md
@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Fix a bug where we were not properly checking for changesets in check-changeset git action
diff --git a/.github/workflows/check-changeset.yml b/.github/workflows/check-changeset.yml
index 48ffc1ca41..f220257c89 100644
--- a/.github/workflows/check-changeset.yml
+++ b/.github/workflows/check-changeset.yml
@@ -40,13 +40,12 @@ jobs:
                   echo "Changed files:"
                   echo "$CHANGED_FILES"
 
-                  echo "Listing .changeset directory:"
-                  ls -la .changeset/
-
                   # Check if any of the changed files are in docs/ or .github/
+                  echo "Checking if changes are docs-only..."
                   DOCS_ONLY=true
                   while IFS= read -r file; do
                     if [[ ! "$file" =~ ^(docs/|.github/) ]]; then
+                      echo "Found non-docs change: $file"
                       DOCS_ONLY=false
                       break
                     fi
@@ -54,14 +53,17 @@ jobs:
 
                   # If changes are docs-only, skip changeset check
                   if [ "$DOCS_ONLY" = true ]; then
-                    echo "Only documentation files were changed, skipping changeset check"
+                    echo "All changes are in docs/ or .github/, skipping changeset check"
                     exit 0
+                  else
+                    echo "Changes include non-docs files, checking for changeset..."
                   fi
 
                   # Check if any changeset files are in the changed files
+                  echo "Checking for changeset files in changed files..."
                   CHANGESET_IN_PR=false
                   while IFS= read -r file; do
-                    if [[ "$file" =~ ^\.changeset/.*\.md$ && "$file" != ".changeset/README.md" ]]; then
+                    if [[ "$file" =~ ^\.changeset/.*\.md$ && "$file" != ".changeset/README.md" && "$file" != ".changeset/config.json" ]]; then
                       echo "Found changeset file in PR: $file"
                       CHANGESET_IN_PR=true
                       break
@@ -69,14 +71,10 @@ jobs:
                   done <<< "$CHANGED_FILES"
 
                   if [ "$CHANGESET_IN_PR" = false ]; then
-                    # Double check local changeset files as backup
-                    CHANGESETS=$(find .changeset -name "*.md" ! -name "README.md" | wc -l | tr -d ' ')
-                    echo "Number of local changesets: $CHANGESETS"
-
-                    if [ "$CHANGESETS" -eq 0 ]; then
-                      echo "::error::No changeset file found in PR changes or local directory. Please run 'npm run changeset' to create one."
-                      exit 1
-                    fi
+                    echo "No changeset files found in changed files. Changed files in .changeset/:"
+                    echo "$CHANGED_FILES" | grep "^\.changeset/" || true
+                    echo "::error::No changeset file found in PR changes. Please run 'npm run changeset' to create one."
+                    exit 1
                   fi
 
             - name: Comment on PR