fix: use CIRCLE_SHA1 for checkout to survive squash-merge branch deletion#8
Merged
Merged
Conversation
…tion After a squash-merge, CircleCI triggers a build where CIRCLE_BRANCH is the now-deleted source branch. git clone -b <branch> then fails with 'branch not found'. Switching to clone default + git checkout SHA1 which always exists regardless of branch lifecycle.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
After a squash-merge, CircleCI triggers a post-merge build where
CIRCLE_BRANCHis set to the now-deleted source branch. The current config does:git clone -b ${CIRCLE_BRANCH} ...This fails with
fatal: Remote branch <branch> not foundbecause squash-merging deletes the source branch.Every squash-merge has been silently causing a post-merge CI failure on main.
Fix
Switch from branch-based clone to SHA-based checkout:
CIRCLE_SHA1is the exact commit SHA CircleCI is testing — always exists regardless of branch lifecycle.