Merge pull request 'CI now syncs dev to main' (#24) from dev into main

2026-09-06 17:36:14 +02:00
parent 59cf4f1e2d 227dc06b58
commit 81c58d5ca0
1 changed files with 23 additions and 0 deletions
@@ -54,3 +54,26 @@ jobs:
          rsync -avz --delete \
            -e "ssh -i ~/.ssh/deploy_key -o UserKnownHostsFile=~/.ssh/known_hosts" \
            dist/ "$DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH"
  sync-dev:
    needs: build-and-deploy
    runs-on: ubuntu-latest
    container:
      image: node:24-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