Skip to content

fix: preserve existing CLI branch work in coverage workflow #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
masnwilliams merged 2 commits into from
Jan 21, 2026
Merged

fix: preserve existing CLI branch work in coverage workflow #62

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c2eb99
fix: preserve existing CLI branch work in coverage workflow
masnwilliams Jan 21, 2026
223521c
Merge branch 'main' into fix/cli-coverage-preserve-branch
masnwilliams Jan 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions .github/workflows/update-cli-coverage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,23 @@ jobs:
run: |
gh repo clone kernel/kernel /tmp/kernel-api -- --depth=1

- name: Clone CLI repo
- name: Clone CLI repo and checkout existing branch
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
run: |
gh repo clone kernel/cli /tmp/kernel-cli
cd /tmp/kernel-cli

# Check if the cli-coverage-update branch already exists on remote
if git ls-remote --exit-code --heads origin cli-coverage-update >/dev/null 2>&1; then
echo "Branch cli-coverage-update exists, checking it out..."
git fetch origin cli-coverage-update
git checkout cli-coverage-update
# Merge latest main to keep it up to date
git merge origin/main -m "Merge main into cli-coverage-update" --no-edit || true
Copy link

@cursor cursor bot Jan 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Silent merge failure leaves repository in conflicted state

High Severity

The git merge origin/main ... || true silently continues when merge conflicts occur. When a merge fails, the repository is left in a "merging" state with conflict markers in files. The Cursor agent then runs on this corrupted state, which could lead to commits containing conflict markers being pushed, or confusing failures. The merge failure needs explicit handling—either fail the workflow, abort the merge, or resolve conflicts.

Fix in Cursor Fix in Web

else
echo "Branch cli-coverage-update does not exist, will create from main"
fi

- name: Get SDK version info
id: sdk-version
Expand Down Expand Up @@ -213,10 +225,12 @@ jobs:
- Run \`go build ./...\` to verify the code compiles

## Step 6: Commit and Push
- Create/update the evergreen branch: cli-coverage-update (always use this single branch name)
- You should already be on the cli-coverage-update branch (it was checked out during setup if it existed)
- If you're on main, create/switch to the cli-coverage-update branch
- Commit with message describing SDK version bump and any new commands/flags
- Force push changes to the CLI repo (since we're updating an evergreen branch)
- Create or update an evergreen PR in kernel/cli
- IMPORTANT: Do NOT force push! Use regular \`git push origin cli-coverage-update\` to preserve existing work on the branch
- If push fails due to divergence, pull and rebase first: \`git pull --rebase origin cli-coverage-update\`
- Create or update the PR in kernel/cli

# SDK Method -> CLI Command Mapping Guide
- client.Resource.New() -> kernel resource create
Expand Down