Bump version to 1.5.0, update release workflow

2026-09-27 02:43:48 +02:00 · 2025-08-08 18:46:12 +02:00
parent 1fe115ac83
commit 3371813c33
2 changed files with 8 additions and 1 deletions
@@ -16,6 +16,13 @@ jobs:
      - name: Checkout repository
        uses: actions/checkout@v4

+      - name: Merge main into release branch
+        run: |
+          git fetch origin main release
+          git checkout release
+          git merge origin/main --no-ff -m "Merge main into release for tag ${{ github.event.release.tag_name }}"
+          git push origin release
+
      - name: Set up Node.js
        uses: actions/setup-node@v4
        with: