From aed80f3e4f5e0957bd4763d71bc4df595d890ae4 Mon Sep 17 00:00:00 2001 From: tombii Date: Sun, 29 Mar 2026 10:44:45 +0200 Subject: [PATCH] ci: add upstream sync workflow --- .github/workflows/sync-upstream.yml | 42 +++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 .github/workflows/sync-upstream.yml diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml new file mode 100644 index 0000000000..bc109005f1 --- /dev/null +++ b/.github/workflows/sync-upstream.yml @@ -0,0 +1,42 @@ +name: Sync Upstream + +on: + schedule: + # Run every 6 hours + - cron: '0 */6 * * *' + workflow_dispatch: + +permissions: + contents: write + +jobs: + sync: + name: Sync with upstream + runs-on: ubuntu-latest + steps: + - name: Checkout + 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: Add upstream remote + run: | + git remote add upstream https://github.com/diegosouzapw/OmniRoute.git || true + git fetch upstream + + - name: Sync main branch + run: | + git checkout main + git merge upstream/main --no-edit || { + echo "Merge conflict detected. Manual intervention required." + exit 1 + } + + - name: Push changes + run: git push origin main