Skip to content

fix: remove /update command from merge-bot (not supported for fork PRs) #38

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
vilsonrodrigues merged 10 commits into from
Dec 3, 2025
Merged

fix: remove /update command from merge-bot (not supported for fork PRs) #38

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1c90a2b
docs: Add CLAUDE.md with project guidelines
vilsonrodrigues Nov 27, 2025
777f67c
Merge branch 'main' of https://github.com/vilsonrodrigues/msgspec-ext
vilsonrodrigues Nov 27, 2025
d266e22
Add CHANGELOG.md for release tracking
vilsonrodrigues Nov 27, 2025
e4f4c76
Merge CHANGELOG.md
vilsonrodrigues Dec 2, 2025
1175b46
Merge branch 'main' of github.com:msgflux/msgspec-ext
vilsonrodrigues Dec 3, 2025
a4fc1ef
Merge branch 'main' of github.com:msgflux/msgspec-ext
vilsonrodrigues Dec 3, 2025
5f39cc9
Merge remote-tracking branch 'upstream/main'
vilsonrodrigues Dec 3, 2025
b033cfe
Merge branch 'main' of github.com:msgflux/msgspec-ext
vilsonrodrigues Dec 3, 2025
f6730b8
fix: remove /update command from merge-bot (not supported for fork PRs)
vilsonrodrigues Dec 3, 2025
38294b3
Merge remote-tracking branch 'upstream/main' into fix/remove-update-c…
vilsonrodrigues Dec 3, 2025
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
369 changes: 0 additions & 369 deletions .github/workflows/merge-bot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,372 +287,3 @@ jobs:
} catch (error) {
core.warning(`Failed to delete branch: ${error.message}`);
}

update-command:
name: Handle Update Command
runs-on: ubuntu-latest
# Only run on PR comments
if: github.event.issue.pull_request
steps:
- name: Parse command
id: command
uses: actions/github-script@v8
with:
script: |
const comment = context.payload.comment.body.toLowerCase().trim();
const user = context.payload.comment.user.login;

core.info(`Comment from ${user}: ${comment}`);

// Check for update command (case insensitive)
// Supported formats:
// - @mergebot update
// - @merge-bot update
// - /update
// - update (if alone)
const updatePatterns = [
/@merge-?bot\s+update/i,
/^\/update$/i,
/^update$/i,
];

const isUpdateCommand = updatePatterns.some(pattern => pattern.test(comment));

if (!isUpdateCommand) {
core.info('Not an update command, skipping');
return;
}

core.setOutput('should_update', 'true');
core.info('✅ Update command detected');

- name: React to comment
if: steps.command.outputs.should_update == 'true'
uses: actions/github-script@v8
with:
script: |
// Add eyes emoji to show bot is processing
await github.rest.reactions.createForIssueComment({
owner: context.repo.owner,
repo: context.repo.repo,
comment_id: context.payload.comment.id,
content: 'eyes'
});

- name: Check permissions
if: steps.command.outputs.should_update == 'true'
id: check_perms
uses: actions/github-script@v8
with:
script: |
const user = context.payload.comment.user.login;

// Check if user has write access
try {
const { data: permission } = await github.rest.repos.getCollaboratorPermissionLevel({
owner: context.repo.owner,
repo: context.repo.repo,
username: user
});

const hasPermission = ['admin', 'write'].includes(permission.permission);

if (!hasPermission) {
core.setFailed(`❌ @${user} does not have permission to update PRs (permission: ${permission.permission})`);

// Comment on PR
await github.rest.issues.createComment({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.payload.issue.number,
body: `❌ @${user} you don't have permission to update PRs. Only collaborators with write access can use update commands.`
});

return;
}

core.info(`✅ User ${user} has ${permission.permission} access`);
core.setOutput('has_permission', 'true');
} catch (error) {
core.setFailed(`Error checking permissions: ${error.message}`);
}

- name: Get PR info
if: steps.check_perms.outputs.has_permission == 'true'
id: pr_info
uses: actions/github-script@v8
with:
script: |
const { data: pr } = await github.rest.pulls.get({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: context.payload.issue.number
});

// Debug information
core.info(`PR #${pr.number}: ${pr.title}`);
core.info(`- Base: ${pr.base.ref} (repo: ${pr.base.repo.full_name})`);
core.info(`- Head: ${pr.head.ref} (repo: ${pr.head.repo.full_name})`);
core.info(`- Same repo: ${pr.head.repo.full_name === pr.base.repo.full_name}`);

// Validate branch information
if (!pr.head.ref || !pr.base.ref) {
core.setFailed('Invalid PR branch information');
return;
}

// Check if it's from the same repository
const isSameRepo = pr.head.repo.full_name === pr.base.repo.full_name;

// Early exit for fork PRs
if (!isSameRepo) {
core.info('❌ PR is from fork - update not supported');
core.setOutput('is_fork', 'true');

const baseBranch = pr.base.ref;
const forkMessage = [
'ℹ️ Update commands are not supported for PRs from forks.',
'',
'To update your branch, please run these commands locally:',
'',
'```bash',
`git fetch upstream ${baseBranch}`,
`git merge upstream/${baseBranch}`,
'git push',
'```',
'',
'Or create a new PR from the same repository.'
].join('\n');

await github.rest.issues.createComment({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.payload.issue.number,
body: forkMessage
});

return;
}

core.setOutput('base_branch', pr.base.ref);
core.setOutput('head_branch', pr.head.ref);
core.setOutput('head_repo', pr.head.repo.full_name);
core.setOutput('base_repo', pr.base.repo.full_name);
core.setOutput('is_same_repo', isSameRepo.toString());

- name: Validate branch exists
if: steps.check_perms.outputs.has_permission == 'true' && steps.pr_info.outputs.is_fork != 'true'
id: validate_branch
uses: actions/github-script@v8
with:
script: |
const headBranch = '${{ steps.pr_info.outputs.head_branch }}';
const headRepo = '${{ steps.pr_info.outputs.head_repo }}';
const isSameRepo = '${{ steps.pr_info.outputs.is_same_repo }}' === 'true';

core.info(`Validating branch: ${headBranch} from repo: ${headRepo}`);

try {
// Check if branch exists
const { data: branch } = await github.rest.repos.getBranch({
owner: headRepo.split('/')[0],
repo: headRepo.split('/')[1],
branch: headBranch
});

core.info(`✅ Branch exists: ${headBranch} (SHA: ${branch.commit.sha})`);
core.setOutput('branch_exists', 'true');

} catch (error) {
if (error.status === 404) {
core.setOutput('branch_exists', 'false');
core.error(`❌ Branch not found: ${headBranch}`);

// Provide helpful error message
let errorMessage = `❌ Cannot update branch: Branch \`${headBranch}\` not found.`;

if (!isSameRepo) {
errorMessage += '\n\nThis appears to be a PR from a fork. Update commands only work for branches in the same repository.';
} else {
errorMessage += '\n\nThis could mean:\n';
errorMessage += '- The branch was deleted after merge\n';
errorMessage += '- The branch name changed\n';
errorMessage += '- There was a force push that changed the branch reference';
}

await github.rest.issues.createComment({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.payload.issue.number,
body: errorMessage
});

return;
}

core.setFailed(`Error checking branch: ${error.message}`);
}

- name: Check if update is needed
if: steps.check_perms.outputs.has_permission == 'true' && steps.validate_branch.outputs.branch_exists == 'true'
id: check_update
uses: actions/github-script@v8
with:
script: |
const baseBranch = '${{ steps.pr_info.outputs.base_branch }}';
const headBranch = '${{ steps.pr_info.outputs.head_branch }}';

try {
// Get latest commit from base branch
const { data: baseBranchData } = await github.rest.repos.getBranch({
owner: context.repo.owner,
repo: context.repo.repo,
branch: baseBranch
});

const baseSha = baseBranchData.commit.sha;

// Check if head branch is behind base (same-repo PRs only at this point)
const { data: comparison } = await github.rest.repos.compareCommits({
owner: context.repo.owner,
repo: context.repo.repo,
base: baseSha,
head: headBranch
});

const isBehind = comparison.behind_by > 0;
const aheadBy = comparison.ahead_by;
const behindBy = comparison.behind_by;

core.info(`Branch comparison: ${behindBy} commits behind, ${aheadBy} commits ahead`);

if (!isBehind) {
core.info('✅ Branch is already up to date');
core.setOutput('update_needed', 'false');
core.setOutput('already_up_to_date', 'true');
} else {
core.info(`Update needed: ${behindBy} commits behind`);
core.setOutput('update_needed', 'true');
core.setOutput('commits_behind', behindBy.toString());
}

} catch (error) {
core.setFailed(`Error checking if update is needed: ${error.message}`);
}

- name: Handle already up-to-date
if: steps.check_perms.outputs.has_permission == 'true' && steps.check_update.outputs.already_up_to_date == 'true'
uses: actions/github-script@v8
with:
script: |
await github.rest.issues.createComment({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.payload.issue.number,
body: '✅ Branch is already up to date with the latest changes!'
});

- name: Checkout PR branch
if: steps.check_perms.outputs.has_permission == 'true' && steps.check_update.outputs.update_needed == 'true' && steps.validate_branch.outputs.branch_exists == 'true'
uses: actions/checkout@v4
with:
repository: ${{ steps.pr_info.outputs.head_repo }}
ref: ${{ steps.pr_info.outputs.head_branch }}
fetch-depth: 0
token: ${{ secrets.GITHUB_TOKEN }}

- name: Update branch
if: steps.check_perms.outputs.has_permission == 'true' && steps.check_update.outputs.update_needed == 'true' && steps.validate_branch.outputs.branch_exists == 'true'
id: update
run: |
BASE_BRANCH="${{ steps.pr_info.outputs.base_branch }}"
HEAD_BRANCH="${{ steps.pr_info.outputs.head_branch }}"
COMMITS_BEHIND="${{ steps.check_update.outputs.commits_behind }}"

git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"

echo "Fetching $BASE_BRANCH..."
git fetch origin "$BASE_BRANCH"

echo "Merging origin/$BASE_BRANCH into $HEAD_BRANCH..."
if git merge "origin/$BASE_BRANCH" -m "chore: Update branch with latest changes from $BASE_BRANCH"; then
echo "merge_success=true" >> $GITHUB_OUTPUT
echo "✅ Branch updated successfully ($COMMITS_BEHIND commits merged)"
else
echo "merge_success=false" >> $GITHUB_OUTPUT
git merge --abort || true
echo "❌ Merge failed - conflicts detected"
exit 1
fi

- name: Push changes
if: steps.update.outputs.merge_success == 'true'
run: |
HEAD_BRANCH="${{ steps.pr_info.outputs.head_branch }}"
HEAD_REPO="${{ steps.pr_info.outputs.head_repo }}"

echo "Pushing changes to $HEAD_BRANCH in $HEAD_REPO..."
git push origin "$HEAD_BRANCH"

- name: Comment success
if: steps.update.outputs.merge_success == 'true'
uses: actions/github-script@v8
with:
script: |
const user = context.payload.comment.user.login;
const baseBranch = '${{ steps.pr_info.outputs.base_branch }}';
const commitsBehind = '${{ steps.check_update.outputs.commits_behind }}';

const successMessage = `✅ Branch updated successfully by @${user}!\n\nMerged ${commitsBehind} commit(s) from \`${baseBranch}\`.`;

await github.rest.issues.createComment({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.payload.issue.number,
body: successMessage
});

// Add +1 reaction to original comment
await github.rest.reactions.createForIssueComment({
owner: context.repo.owner,
repo: context.repo.repo,
comment_id: context.payload.comment.id,
content: '+1'
});

- name: Comment failure
if: failure() && steps.check_perms.outputs.has_permission == 'true'
uses: actions/github-script@v8
with:
script: |
const baseBranch = '${{ steps.pr_info.outputs.base_branch }}';

const failureMessage = [
`❌ Failed to update branch with latest changes from \`${baseBranch}\`.`,
'',
'This usually means there are merge conflicts that need to be resolved manually.',
'',
'Please update your branch locally:',
'```bash',
`git fetch origin ${baseBranch}`,
`git merge origin/${baseBranch}`,
'# Resolve conflicts',
'git push',
'```'
].join('\n');

await github.rest.issues.createComment({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.payload.issue.number,
body: failureMessage
});

// Add -1 reaction to original comment
await github.rest.reactions.createForIssueComment({
owner: context.repo.owner,
repo: context.repo.repo,
comment_id: context.payload.comment.id,
content: '-1'
});
Loading