Update release.yml

Author: dsbilling

.github/workflows/release.yml

@@ -7,13 +7,21 @@ on:
             - main
 
 jobs:
-    update-changelog:
+    release:
+        name: "Generate release and publish to PyPI"
         runs-on: ubuntu-latest
+        environment:
+            name: pypi
+            url: https://pypi.org/p/tunsberg
+        permissions:
+            id-token: write  # IMPORTANT: this permission is mandatory for trusted publishing
         steps:
-            -   name: Checkout code
+            -   name: Checkout repository
                 uses: actions/checkout@v4
                 with:
-                    ref: main
+                    fetch-depth: 0
+                    token: ${{ secrets.KILOBYTE_BOT_PAT }}
+                    fetch-tags: true
 
             -   name: Update Changelog
                 uses: stefanzweifel/changelog-updater-action@v1
@@ -28,45 +36,36 @@ jobs:
                     commit_message: Update CHANGELOG
                     file_pattern: CHANGELOG.md
 
-    pypi-publish:
-        name: Upload release to PyPI
-        runs-on: ubuntu-latest
-        environment:
-            name: pypi
-            url: https://pypi.org/p/tunsberg
-        permissions:
-            id-token: write  # IMPORTANT: this permission is mandatory for trusted publishing
-        steps:
-            -   name: Checkout repository
-                uses: actions/checkout@v4
-                with:
-                    fetch-depth: 0
-                    token: ${{ secrets.KILOBYTE_BOT_PAT }}
-                    fetch-tags: true
             -   name: Set up Python
                 uses: actions/setup-python@v5
                 with:
                     python-version: "3.10"
+
             -   name: Install dependencies
                 run: |
                     python -m pip install --upgrade pip
                     pip install -r requirements-dev.txt
+
             -   name: Git Config
                 run: |
                     git config --global user.email "[email protected]"
                     git config --global user.name "kilobyte-bot"
+
             -   name: Update __version__ in __init__.py
                 run: |
+                    git pull origin HEAD:main
                     echo "Version: ${{ github.ref_name }}"
                     sed -i "s/__version__ = .*/__version__ = '${{ github.ref_name }}'/" ./tunsberg/__init__.py
                     cat ./tunsberg/__init__.py
                     git commit -am "Bump version to ${{ github.ref_name }}"
                     git push origin HEAD:main
+
             -   name: Build package
-                run: |
-                    python setup.py bdist_wheel
+                run: python setup.py bdist_wheel
+
             -   name: Publish package distributions to PyPI
                 uses: pypa/gh-action-pypi-publish@release/v1
+
             -   name: Post release to Discord
                 uses: SethCohen/[email protected]
                 with: