Github Actions - build deb (#1)

* build deb

* add setups dependency

* update deps

* Update dep

* update deps

* Update deps

* more deps

* new release action

* update action

* update action

* Bump version to 1.0.0

* update actions

* Bump version to 1.0.1

* Bump version to 3.6.0-rc2

* update secret

* Bump version to 3.6.0-rc2.post1

* update build deb

* Bump version to 3.6.0-rc1.post11

* only run action once

* Bump version to 3.6.0-rc2.post2

---------

Co-authored-by: GitHub Actions <[email protected]>

Author: AndyEveritt

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.6.0-rc1
+current_version = 3.6.0-rc2.post2
 commit = False
 tag = False
 allow_dirty = False

.github/workflows/publish-to-pypi.yml

@@ -25,17 +25,6 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install setuptools
-        pip install bump2version
-    - name: Bumpversion
-      run: bumpversion --new-version=${{ github.event.release.tag_name }} minor
-    - name: Commit version change
-      run: |
-          git config --global user.name 'Github Actions'
-          git config --global user.email '[email protected]'
-          git commit -am "Release ${{ github.event.release.name }}" --allow-empty
-          git tag -f ${{ github.event.release.tag_name }}
-          git push origin HEAD:v3.6-dev
-          git push origin -f --tags
     - name: Install pypa/build
       run: >-
         python3 -m
@@ -56,9 +45,6 @@ jobs:
     needs:
     - build
     runs-on: ubuntu-latest
-    environment:
-      name: pypi
-      url: https://pypi.org/p/dsf-python
     permissions:
       id-token: write  # IMPORTANT: mandatory for trusted publishing
     steps:
@@ -71,29 +57,35 @@ jobs:
       uses: pypa/gh-action-pypi-publish@release/v1
 
   build-deb:
-    name: Build Debian package for Raspberry Pi 📦
+    name: Build Debian package 📦
     runs-on: ubuntu-latest
+    # Add permissions for releases
+    permissions:
+      contents: write
     steps:
     - uses: actions/checkout@v4
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v3
-    - name: Build Debian package in Raspberry Pi OS container
-      uses: docker/setup-buildx-action@v3
-    - name: Build ARM Debian package
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.x'
+    - name: Install apt packages
+      run: sudo apt-get update && sudo apt-get install -y dpkg-dev debhelper dh-python build-essential python3-all
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install setuptools
+        pip install stdeb3
+        pip install wheel
+    - name: Clean up previous builds
+      run: rm -rf deb_dist/ || true
+    - name: Build Debian package
       run: |
-        docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-        docker run --platform linux/arm/v7 -v $(pwd):/workspace -w /workspace \
-          balenalib/raspberry-pi-debian:latest \
-          /bin/bash -c "apt-get update && \
-                        apt-get install -y python3 python3-pip python3-dev python3-setuptools python3-stdeb dh-python \
-                                          debhelper build-essential && \
-                        pip3 install -e . && \
-                        make build_deb"
+        make build_deb || exit 1
     - name: List built packages
       run: find deb_dist -name "*.deb"
     - name: Upload Debian package to release
       uses: softprops/action-gh-release@v2
-      if: github.event_name == 'release'
       with:
+        token: ${{ secrets.PAT }}
         files: "deb_dist/*.deb"
         tag_name: ${{ github.event.release.tag_name }}

.github/workflows/python-test.yml

@@ -8,6 +8,8 @@ on:
     branches: [ "*" ]
   pull_request:
     branches: [ "*" ]
+  release:
+    types: [published]
 
 jobs:
   build:

.github/workflows/release.yml

@@ -0,0 +1,86 @@
+name: Bump Version and Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      new_version:
+        description: 'New version number (e.g., 1.2.3)'
+        required: true
+
+jobs:
+  bump-and-release:
+    runs-on: ubuntu-latest
+    # Add write permissions for the GITHUB_TOKEN
+    permissions:
+      contents: write
+      packages: write
+      pull-requests: write
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          # Explicitly provide the token for private repo access
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+
+      - name: Install bumpversion
+        run: pip install bump2version
+
+      - name: Bump version
+        run: |
+          bumpversion --new-version ${{ github.event.inputs.new_version }} --no-commit --no-tag minor
+
+      - name: Commit and tag version
+        run: |
+          git config --global user.name "GitHub Actions"
+          git config --global user.email "[email protected]"
+          git commit -am "Bump version to ${{ github.event.inputs.new_version }}" --allow-empty
+          git tag ${{ github.event.inputs.new_version }}
+
+      - name: Push changes and tag
+        run: |
+          # Use authenticated URL format for pushing
+          git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
+          git push origin HEAD:gh-actions
+          git push origin --tags
+
+      - name: Get previous tag
+        id: prev_tag
+        run: |
+          git fetch --tags
+          git for-each-ref --sort=-creatordate --format '%(refname:short)' refs/tags > tags.txt
+          readarray -t tags < tags.txt
+          if [ ${#tags[@]} -lt 2 ]; then
+            echo "prev_tag=" >> $GITHUB_OUTPUT
+          else
+            echo "prev_tag=${tags[1]}" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Generate changelog
+        id: changelog
+        run: |
+          if [ -z "${{ steps.prev_tag.outputs.prev_tag }}" ]; then
+            echo "body=Initial release" >> $GITHUB_OUTPUT
+          else
+            log=$(git log --pretty=format:"- %s (%h)" ${{ steps.prev_tag.outputs.prev_tag }}..${{ github.event.inputs.new_version }})
+            echo "body<<EOF" >> $GITHUB_OUTPUT
+            echo "## Changelog since ${{ steps.prev_tag.outputs.prev_tag }}" >> $GITHUB_OUTPUT
+            echo "$log" >> $GITHUB_OUTPUT
+            echo "EOF" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Create GitHub Release
+        id: create_release
+        uses: actions/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT }}
+        with:
+          tag_name: ${{ github.event.inputs.new_version }}
+          release_name: ${{ github.event.inputs.new_version }}
+          body: ${{ steps.changelog.outputs.body }}
+          draft: false
+          prerelease: false

Makefile

@@ -18,6 +18,6 @@ check_dist: update_dist
 build_deb:
 	rm -rf deb_dist/
 	sed -i -E '/forced-upstream-version/ s/([0-9]+)\.([0-9]+)\.([0-9]+)-([a-z]+)([0-9]+)/\1.\2.\3~\4\5/' setup.cfg
-	python setup.py --command-packages=stdeb.command sdist_dsc bdist_deb
+	python3 setup.py --command-packages=stdeb3.command bdist_deb
 	sed -i -E '/forced-upstream-version/ s/([0-9]+)\.([0-9]+)\.([0-9]+)~([a-z]+)([0-9]+)/\1.\2.\3-\4\5/' setup.cfg
 	dpkg-deb -I deb_dist/*.deb

setup.cfg

@@ -8,4 +8,4 @@ max-line-length = 120
 
 [sdist_dsc]
 # Force the version to use `~` before any prerelease identifiers
-forced-upstream-version = 3.6.0-rc1
+forced-upstream-version = 3.6.0-rc2.post2

setup.py

@@ -6,7 +6,7 @@
 
 setuptools.setup(
     name="dsf-python",
-    version="3.6.0-rc1",
+    version="3.6.0-rc2.post2",
     description="Python interface to access DuetSoftwareFramework",
     long_description=long_description,
     long_description_content_type="text/markdown",

src/dsf/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "3.6.0-rc1"
+__version__ = "3.6.0-rc2.post2"
 
 # path to unix socket file
 SOCKET_FILE = "/run/dsf/dcs.sock"