mirror of
https://github.com/coollabsio/coolify.git
synced 2026-11-04 10:42:23 +00:00
Andras Bacsai
408ee23936
Sync main into next automatically and update release workflows and contributor docs for the long-lived next branch.
66 lines
2.2 KiB
YAML
66 lines
2.2 KiB
YAML
name: Sync main to next
|
|
|
|
on:
|
|
schedule:
|
|
- cron: '*/10 * * * *'
|
|
workflow_dispatch:
|
|
|
|
permissions:
|
|
contents: write
|
|
pull-requests: write
|
|
|
|
concurrency:
|
|
group: sync-main-to-next
|
|
cancel-in-progress: false
|
|
|
|
jobs:
|
|
sync:
|
|
name: Merge main into next
|
|
runs-on: ubuntu-latest
|
|
steps:
|
|
- name: Checkout repository
|
|
uses: actions/checkout@v5
|
|
with:
|
|
fetch-depth: 0
|
|
|
|
- name: Merge main into next
|
|
env:
|
|
GH_TOKEN: ${{ github.token }}
|
|
run: |
|
|
git config user.name 'github-actions[bot]'
|
|
git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
|
|
git fetch origin main next
|
|
git checkout --quiet -B next origin/next
|
|
|
|
if git merge --no-edit origin/main; then
|
|
git push origin HEAD:refs/heads/next
|
|
exit 0
|
|
fi
|
|
|
|
conflicts=$(git diff --name-only --diff-filter=U)
|
|
git merge --abort
|
|
|
|
if [ -z "$conflicts" ]; then
|
|
echo '::error title=main to next sync failed::The merge failed without conflicts, so no pull request was created.'
|
|
exit 1
|
|
fi
|
|
|
|
sync_branch='automation/sync-main-to-next'
|
|
existing_pr=$(gh pr list --base next --head "$sync_branch" --state open --json url --jq '.[0].url')
|
|
if [ -n "$existing_pr" ]; then
|
|
# The conflict was already reported when this pull request was opened.
|
|
# Stay green until it is merged instead of failing every scheduled run.
|
|
echo "::notice title=main to next sync blocked::main still conflicts with next; resolve the open pull request: $existing_pr"
|
|
exit 0
|
|
fi
|
|
|
|
git push --force origin origin/main:"refs/heads/$sync_branch"
|
|
gh pr create \
|
|
--base next \
|
|
--head "$sync_branch" \
|
|
--title 'chore: merge main into next' \
|
|
--body 'This pull request was created automatically because main could not be merged into next without conflicts. Resolve conflicts on this temporary branch; never update main with next.'
|
|
|
|
echo '::error title=main to next sync blocked::main could not be merged into next without conflicts; a pull request was opened to resolve them.'
|
|
exit 1
|