From 018d1f362f846b749e534257ae4f68007db8f2a5 Mon Sep 17 00:00:00 2001 From: Erick Ahmed Date: Tue, 11 Nov 2025 15:40:05 +0100 Subject: [PATCH] Sync regularly with upstream --- .gitea/workflows/sync-upstream.yml | 31 ++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .gitea/workflows/sync-upstream.yml diff --git a/.gitea/workflows/sync-upstream.yml b/.gitea/workflows/sync-upstream.yml new file mode 100644 index 0000000..25bb1ff --- /dev/null +++ b/.gitea/workflows/sync-upstream.yml @@ -0,0 +1,31 @@ +name: Sync Upstream + +on: + schedule: + - cron: "0 0 * * 0" + workflow_dispatch: + +jobs: + sync: + runs-on: ubuntu-latest + steps: + - name: Checkout fork + uses: actions/checkout@v3 + with: + fetch-depth: 0 + ref: master + + - name: Add upstream remote + run: | + git remote add upstream https://git.suckless.org/dwm || true + git fetch upstream + + - name: Merge upstream into master + run: | + git config user.name "gitea-runner[bot]" + git config user.email "gitea-runner[bot]@noreply.erickahmed.com" + git merge upstream/master --strategy-option ours --no-edit || true + + - name: Push merged branch + run: | + git push origin master