From 298bb2dadddc5f82aca584a05fe92979ee54eaf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20P=C3=B6tzl?= Date: Wed, 14 Oct 2026 21:38:53 +0200 Subject: [PATCH] Add workflow to fast-forward dev after release merge --- .github/workflows/sync-dev-with-main.yml | 25 ++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/sync-dev-with-main.yml diff --git a/.github/workflows/sync-dev-with-main.yml b/.github/workflows/sync-dev-with-main.yml new file mode 100644 index 0000000..82f8076 --- /dev/null +++ b/.github/workflows/sync-dev-with-main.yml @@ -0,0 +1,25 @@ +name: Sync dev with main + +on: + pull_request: + types: [closed] + branches: [main] + +permissions: + contents: write + +jobs: + fast-forward-dev: + if: github.event.pull_request.merged == true && github.event.pull_request.head.ref == 'dev' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + ref: dev + fetch-depth: 0 + + - name: Fast-forward dev to main + run: | + git fetch origin main + git merge --ff-only origin/main + git push origin dev