Skip to content
Merged
Changes from all commits
Commits
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
47 changes: 47 additions & 0 deletions .github/workflows/sync_with_upstream.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Sync with Upstream

on:
schedule:
- cron: '0 0 * * *' # Runs daily at midnight
push:
branches:
- main

jobs:
sync:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2

Check failure on line 16 in .github/workflows/sync_with_upstream.yml

View workflow job for this annotation

GitHub Actions / pre-commit

the runner of "actions/checkout@v2" action is too old to run on GitHub Actions. update the action's version to fix this issue
with:
fetch-depth: 0

- name: Set up Git
run: |
git config --global user.name 'github-actions[bot]'
git config --global user.email 'github-actions[bot]@users.noreply.github.com'

- name: Add upstream remote
run: git remote add upstream https://github.com/vllm-project/vllm.git

- name: Fetch upstream changes
run: git fetch upstream

- name: Merge upstream changes
run: |

Check failure on line 32 in .github/workflows/sync_with_upstream.yml

View workflow job for this annotation

GitHub Actions / pre-commit

shellcheck reported issue in this script: SC2046:warning:4:34: Quote this to prevent word splitting

Check failure on line 32 in .github/workflows/sync_with_upstream.yml

View workflow job for this annotation

GitHub Actions / pre-commit

shellcheck reported issue in this script: SC2046:warning:3:34: Quote this to prevent word splitting
git checkout main
git merge upstream/main || {
git checkout -b merge-conflict-$(date +%Y%m%d%H%M%S)
git push origin merge-conflict-$(date +%Y%m%d%H%M%S)
exit 1
}

- name: Push changes
run: git push origin main

- name: Send notification if merge conflict
if: failure()
run: |
echo "Merge conflict detected. Manual intervention required."
# Add your notification logic here (e.g., send an email, create an issue, etc.)
Loading