Skip to content

Merge pull request #19 from chatbotkit/next #17

Merge pull request #19 from chatbotkit/next

Merge pull request #19 from chatbotkit/next #17

Workflow file for this run

# Backmerge releases from main to next
#
# This workflow ensures that any commits on `main` (releases, version bumps)
# are automatically merged back into `next` to keep branches in sync.
#
# This prevents divergence where main has commits that next doesn't have.
name: Backmerge to next
on:
push:
branches: [main]
permissions:
contents: write
jobs:
backmerge:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
ref: next
fetch-depth: 0
token: ${{ secrets.GITHUB_TOKEN }}
- name: Merge main into next
run: |
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"
git fetch origin main
if git merge-base --is-ancestor origin/main HEAD; then
echo "next already contains all commits from main. Nothing to merge."
exit 0
fi
git merge origin/main -m "chore: backmerge from main"
git push origin next