sketch: fix Discord notifications to show all commits in stack
The COMMITS_TO_NOTIFY command was only returning the top commit instead of
all commits being pushed to main. This happened because in GitHub Actions
context, the origin/main reference might not be current.
Fix by fetching the latest main branch reference and using the local main
branch as the base for the git log range calculation instead of origin/main.
This ensures all commits in the stack are properly included in Discord
notifications.
Co-Authored-By: sketch <hello@sketch.dev>
Change-ID: seddc0c760b07e1adk
diff --git a/.github/workflows/queue-dev.yml b/.github/workflows/queue-dev.yml
index e34cc22..8da0dc2 100644
--- a/.github/workflows/queue-dev.yml
+++ b/.github/workflows/queue-dev.yml
@@ -57,8 +57,12 @@
COMMIT_SHA=$(git rev-parse "${COMMIT_TO_PUSH}")
echo "commit_sha=${COMMIT_SHA}" >> $GITHUB_OUTPUT
+ # Ensure we have the latest main branch reference
+ git fetch origin main
+
# Get the list of commits that would be pushed (in chronological order)
- COMMITS_TO_NOTIFY=$(git log origin/main.."${COMMIT_TO_PUSH}" --reverse --format="%H" | tr '\n' ' ')
+ # Use FETCH_HEAD as the base to avoid rewriting local main reference
+ COMMITS_TO_NOTIFY=$(git log FETCH_HEAD.."${COMMIT_TO_PUSH}" --reverse --format="%H" | tr '\n' ' ')
echo "commits_to_notify=${COMMITS_TO_NOTIFY}" >> $GITHUB_OUTPUT
echo "Commits that would be pushed and notified: ${COMMITS_TO_NOTIFY}"