- Notifications
You must be signed in to change notification settings - Fork1.5k
Sync next branch with main#590
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
Show all changes
16 commits Select commitHold shift + click to select a range
23b16cf
feat: add pagination support to get_pull_request_files tool (#561)
anant-rustagiacba284
cleanup search_users response (#486)
SamMorrowDrums5f92434
Add search pull requests tool
JoannaaKL805358b
Split pr and issue search
JoannaaKL8bd7152
Add repo and owner
JoannaaKLaaaff4f
Add underscore variant
JoannaaKL9e1d401
Remove unnecessary or
JoannaaKL76535ee
Bind
JoannaaKLecc57ff
Update main.go
JoannaaKL0166ca5
Tidy
JoannaaKL96f0173
Fix linter error
JoannaaKL7f8d28e
add a new release workflow
SamMorrowDrums46089ed
improve release.yml to ensure that the ref is up-to-date
SamMorrowDrums5dc5bb7
Release process update (#587)
SamMorrowDrumsb9a5f2c
fix bug in create PR code (#588)
SamMorrowDrums3deaca8
don't actually create a PR (#589)
SamMorrowDrumsFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
name: PR Base Branch Check | ||
on: | ||
pull_request: | ||
types: [opened, edited, synchronize] | ||
branches: | ||
- main | ||
permissions: | ||
pull-requests: write | ||
contents: read | ||
jobs: | ||
check-base-branch: | ||
runs-on: ubuntu-latest | ||
if: github.event.pull_request.base.ref == 'main' | ||
steps: | ||
- name: Comment on PR | ||
uses: actions/github-script@v7 | ||
with: | ||
script: | | ||
const message = `👋 Hi there! | ||
It looks like this PR is targeting the \`main\` branch. To help maintain our development workflow, please change the base reference to \`next\` instead. | ||
__If this is a bug fix that requires a patch release __ (e.g., a critical bug that needs to be fixed before the next release)__, please leave the base branch as \`main\`.__ | ||
You can change this by: | ||
1. Clicking the "Edit" button next to the PR title | ||
2. Changing the base branch from \`main\` to \`next\` | ||
3. Clicking "Update pull request" | ||
Thanks for your contribution! 🚀`; | ||
// Check if we've already commented | ||
const comments = await github.rest.issues.listComments({ | ||
owner: context.repo.owner, | ||
repo: context.repo.repo, | ||
issue_number: context.issue.number, | ||
}); | ||
const botComment = comments.data.find(comment => | ||
comment.user.type === 'Bot' && | ||
comment.body.includes('please change the base reference to') | ||
); | ||
if (!botComment) { | ||
await github.rest.issues.createComment({ | ||
owner: context.repo.owner, | ||
repo: context.repo.repo, | ||
issue_number: context.issue.number, | ||
body: message | ||
}); | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,177 @@ | ||
name: Release | ||
on: | ||
workflow_dispatch: | ||
inputs: | ||
tag: | ||
description: 'Release tag (e.g., v0.0.0)' | ||
required: true | ||
default: 'v0.0.0' | ||
type: string | ||
confirm: | ||
description: 'Type "CONFIRM" to proceed with the release' | ||
required: true | ||
type: string | ||
permissions: | ||
contents: write | ||
pull-requests: write | ||
jobs: | ||
validate: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Validate confirmation | ||
if: ${{ github.event.inputs.confirm != 'CONFIRM' }} | ||
run: | | ||
echo "::error::You must type 'CONFIRM' to proceed with the release" | ||
exit 1 | ||
- name: Validate tag format | ||
run: | | ||
TAG="${{ github.event.inputs.tag }}" | ||
if [[ ! $TAG =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-.*)?$ ]]; then | ||
echo "::error::Tag must be in format vX.Y.Z or vX.Y.Z-suffix (e.g., v1.0.0 or v1.0.0-rc1)" | ||
exit 1 | ||
fi | ||
release: | ||
needs: validate | ||
runs-on: ubuntu-latest | ||
outputs: | ||
tag: ${{ steps.tag-release.outputs.tag }} | ||
steps: | ||
- name: Checkout repository | ||
uses: actions/checkout@v4 | ||
with: | ||
fetch-depth: 0 | ||
token: ${{ secrets.GITHUB_TOKEN }} | ||
- name: Configure Git | ||
run: | | ||
git config user.name "github-actions[bot]" | ||
git config user.email "github-actions[bot]@users.noreply.github.com" | ||
- name: Switch to next branch | ||
run: | | ||
git checkout next | ||
git pull origin next | ||
- name: Check next branch is up-to-date with main | ||
id: branch-check | ||
run: | | ||
echo "Checking if next branch is up-to-date with main..." | ||
# Fetch latest main branch | ||
git fetch origin main | ||
# Check if next is behind main | ||
BEHIND_COUNT=$(git rev-list --count next..origin/main) | ||
AHEAD_COUNT=$(git rev-list --count origin/main..next) | ||
echo "Next branch is ${AHEAD_COUNT} commits ahead of main" | ||
echo "Next branch is ${BEHIND_COUNT} commits behind main" | ||
if [ "$BEHIND_COUNT" -gt 0 ]; then | ||
echo "::error::❌ Next branch is ${BEHIND_COUNT} commits behind main. Please update next branch with the latest changes from main before creating a release." | ||
echo "To fix this, run: git checkout next && git merge main" | ||
exit 1 | ||
fi | ||
if [ "$AHEAD_COUNT" -eq 0 ]; then | ||
echo "::warning::⚠️ Next branch has no new commits compared to main. Are you sure you want to create a release?" | ||
fi | ||
echo "✅ Next branch is up-to-date with main (${AHEAD_COUNT} commits ahead)" | ||
echo "branch-check-success=true" >> $GITHUB_OUTPUT | ||
- name: Check if tag already exists | ||
run: | | ||
TAG="${{ github.event.inputs.tag }}" | ||
if git tag -l | grep -q "^${TAG}$"; then | ||
echo "::error::Tag ${TAG} already exists" | ||
exit 1 | ||
fi | ||
if git ls-remote --tags origin | grep -q "refs/tags/${TAG}$"; then | ||
echo "::error::Tag ${TAG} already exists on remote" | ||
exit 1 | ||
fi | ||
- name: Tag the release | ||
id: tag-release | ||
run: | | ||
TAG="${{ github.event.inputs.tag }}" | ||
git tag -a "${TAG}" -m "Release ${TAG}" | ||
echo "✅ Created tag ${TAG}" | ||
echo "tag=${TAG}" >> $GITHUB_OUTPUT | ||
- name: Push tag | ||
run: | | ||
TAG="${{ github.event.inputs.tag }}" | ||
git push origin "${TAG}" | ||
echo "✅ Pushed tag ${TAG}" | ||
- name: Wait for release to be created | ||
run: | | ||
TAG="${{ github.event.inputs.tag }}" | ||
echo "Waiting for GitHub to create the draft release..." | ||
# Wait up to 2 minutes for the release to appear | ||
for i in {1..24}; do | ||
if gh release view "${TAG}" >/dev/null 2>&1; then | ||
echo "✅ Draft release created" | ||
break | ||
fi | ||
echo "Waiting for release to be created... (${i}/24)" | ||
sleep 5 | ||
done | ||
env: | ||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
summary: | ||
needs: [validate, release] | ||
runs-on: ubuntu-latest | ||
if: always() && needs.release.result == 'success' | ||
steps: | ||
- name: Release Summary | ||
run: | | ||
TAG="${{ needs.release.outputs.tag }}" | ||
echo "## 🎉 Release $TAG has been initiated!" | ||
echo "" | ||
echo "### Next steps:" | ||
echo "1. 📋 Check https://github.com/${{ github.repository }}/releases for the draft release to show up" | ||
echo "2. ✏️ Edit the new release, delete the existing notes and click the auto-generate button GitHub provides" | ||
echo "3. ✨ Add a section at the top calling out the main features" | ||
echo "4. 🚀 Publish the release" | ||
echo "5. � Create a Pull Request from 'next' to 'main' branch with title 'Release $TAG'" | ||
echo "6. �🔀 Merge the pull request into main" | ||
echo "7. 📢 Post message in #gh-mcp-releases channel in Slack and then share to the other mcp channels" | ||
echo "" | ||
echo "### Resources:" | ||
echo "- 📦 Draft Release: https://github.com/${{ github.repository }}/releases/tag/$TAG" | ||
echo "- 🔄 Create PR: https://github.com/${{ github.repository }}/compare/main...next" | ||
echo "" | ||
echo "The release process is now ready for your review and completion!" | ||
# Also output as job summary | ||
cat << EOF >> $GITHUB_STEP_SUMMARY | ||
## 🎉 Release $TAG has been initiated! | ||
### Next steps: | ||
1. 📋 Check [releases page](https://github.com/${{ github.repository }}/releases) for the draft release to show up | ||
2. ✏️ Edit the new release, delete the existing notes and click the auto-generate button GitHub provides | ||
3. ✨ Add a section at the top calling out the main features | ||
4. 🚀 Publish the release | ||
5. � [Create a Pull Request](https://github.com/${{ github.repository }}/compare/main...next) from 'next' to 'main' branch with title 'Release $TAG' | ||
6. �🔀 Merge the pull request into main | ||
7. 📢 Post message in #gh-mcp-releases channel in Slack and then share to the other mcp channels | ||
### Resources: | ||
- 📦 [Draft Release](https://github.com/${{ github.repository }}/releases/tag/$TAG) | ||
- 🔄 [Create PR](https://github.com/${{ github.repository }}/compare/main...next) | ||
The release process is now ready for your review and completion! | ||
EOF |
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
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.