ci(release.yaml): make 'merge into develop' task optional

.github/workflows/release.yaml

@@ -5,35 +5,35 @@ on:
     inputs:
       short_description:
         type: string
-        description: 'Short description of the release'
+        description: "Short description of the release"
         required: false
       auto_bump:
         type: boolean
-        description: 'Auto bump version?'
+        description: "Auto bump version?"
         required: true
       bump_type:
         type: choice
-        description: 'Bump type'
+        description: "Bump type"
         required: true
         options:
-          - 'major'
+          - "major"
-          - 'minor'
+          - "minor"
-          - 'patch'
+          - "patch"
-          - 'prerelease'
+          - "prerelease"
       as_pre_release:
         type: boolean
-        description: 'As pre-release?'
+        description: "As pre-release?"
         required: true
       prerelease_type:
         type: choice
-        description: 'Pre-release label'
+        description: "Pre-release label"
         required: true
         options:
-          - 'dev'
+          - "dev"
-          - 'alpha'
+          - "alpha"
-          - 'beta'
+          - "beta"
-          - 'rc'
+          - "rc"
-          - 'post'
+          - "post"
 jobs:
   bump_version:
     runs-on: ubuntu-latest
@@ -44,7 +44,7 @@ jobs:
         with:
           fetch-depth: 0
           token: "${{ secrets.GITHUB_TOKEN }}"
-          submodules: 'recursive'
+          submodules: "recursive"
 
       - name: 📦 install uv
         uses: astral-sh/setup-uv@v5
@@ -92,9 +92,12 @@ jobs:
           echo "Changes:" && cat release_body.md
           uv run git-cliff > CHANGELOG.md
 
+      - name: 📦 update lockfile (re-sync)
+        run: uv sync
+
       - name: 📤 push changes
         run: |
-          git add CHANGELOG.md pyproject.toml src/*/__init__.py
+          git add CHANGELOG.md pyproject.toml src/*/__init__.py uv.lock
           git commit -m "chore(release): ${{ steps.get_version.outputs.BUMPED_VERSION }}"
           git push origin main
 
@@ -105,7 +108,7 @@ jobs:
           tag_name: ${{ steps.get_version.outputs.BUMPED_VERSION }}
           body_path: release_body.md
           prerelease: ${{ github.event.inputs.as_pre_release }}
-          discussion_category_name: 'Announcements'
+          discussion_category_name: "Announcements"
 
       - name: 🧹 cleanup
         run: |
@@ -113,9 +116,13 @@ jobs:
 
       - name: 📤 merge into develop
         run: |
-          git checkout develop
+          if git show-ref --quiet refs/heads/develop; then
-          git merge main
+            git checkout develop
-          git push origin develop
+            git merge main
+            git push origin develop
+          else
+            echo "develop doesn't exist, skipping..."
+          fi
 
       - name: ✅ done
         run: echo "done"