From 28c83f1d089f137a6a81c880bc2e9583315c8abb Mon Sep 17 00:00:00 2001
From: Robin Dittmar <robindittmar@gmail.com>
Date: Sun, 6 Sep 2026 17:35:10 +0200
Subject: [PATCH] fix: ci now syncs dev to main

---
 .gitea/workflows/deploy.yml | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 8b83eda..439889b 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -15,7 +15,7 @@ jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
     container:
-      image: golang:1.27-bookworm  # match the go version in go.mod
+      image: golang:1.27-bookworm
     steps:
       - name: Install system dependencies
         run: apt-get update && apt-get install -y --no-install-recommends git openssh-client
@@ -59,3 +59,26 @@ jobs:
           ssh -i ~/.ssh/deploy_key -o UserKnownHostsFile=~/.ssh/kn
             "$DEPLOY_USER@$DEPLOY_HOST" \
             "cd $DEPLOY_PATH && git pull && docker compose up -d --build"
+
+  sync-dev:
+    needs: build-and-deploy
+    runs-on: ubuntu-latest
+    container:
+      image: golang:1.27-bookworm
+    permissions:
+      contents: write
+    steps:
+      - name: Install system dependencies
+        run: apt-get update && apt-get install -y --no-install-recommends git
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Fast-forward dev to main
+        run: |
+          git fetch origin dev:dev
+          git checkout dev
+          git merge --ff-only origin/main
+          git push origin dev