From 7c10caa78b927e31cdd69f550ac3aaafc50c7be1 Mon Sep 17 00:00:00 2001
From: Austin <vidplace7@gmail.com>
Date: Sun, 5 Jan 2025 13:31:01 -0500
Subject: [PATCH] meshtastic-debian: publish with dput (#5753)

---
 .github/workflows/build_debian_src.yml |  8 ++---
 .github/workflows/package_ppa.yml      | 50 ++++++++++++++++----------
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build_debian_src.yml b/.github/workflows/build_debian_src.yml
index 72e4adf3e..dfd8b66fb 100644
--- a/.github/workflows/build_debian_src.yml
+++ b/.github/workflows/build_debian_src.yml
@@ -24,13 +24,13 @@ jobs:
 
       - name: Install deps
         shell: bash
+        working-directory: meshtasticd
         run: |
           sudo apt-get update -y --fix-missing
           sudo apt-get install -y software-properties-common
           sudo add-apt-repository ppa:meshtastic/meshtastic-daily -y
-          sudo apt-get install -y build-essential devscripts equivs \
-            platformio python3-protobuf python3-grpcio \
-            libyaml-cpp-dev libgpiod-dev libbluetooth-dev libusb-1.0-0-dev libi2c-dev
+          sudo apt-get install -y build-essential devscripts equivs
+          sudo mk-build-deps --install --remove --tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' debian/control
 
       - name: Import GPG key
         uses: crazy-max/ghaction-import-gpg@v6
@@ -54,7 +54,7 @@ jobs:
       - name: Store binaries as an artifact
         uses: actions/upload-artifact@v4
         with:
-          name: firmware-debian-${{ steps.version.outputs.long }}-src.zip
+          name: firmware-debian-${{ steps.version.outputs.long }}-src
           overwrite: true
           path: |
             meshtasticd_${{ steps.version.outputs.short }}*
diff --git a/.github/workflows/package_ppa.yml b/.github/workflows/package_ppa.yml
index 1fcc96e11..9d59df472 100644
--- a/.github/workflows/package_ppa.yml
+++ b/.github/workflows/package_ppa.yml
@@ -24,10 +24,24 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
+          path: meshtasticd
           ref: ${{github.event.pull_request.head.ref}}
           repository: ${{github.event.pull_request.head.repo.full_name}}
 
+      - name: Install deps
+        shell: bash
+        run: |
+          sudo apt-get update -y --fix-missing
+          sudo apt-get install -y dput
+
+      - name: Import GPG key
+        uses: crazy-max/ghaction-import-gpg@v6
+        with:
+          gpg_private_key: ${{ secrets.PPA_GPG_PRIVATE_KEY }}
+        id: gpg
+
       - name: Get release version string
+        working-directory: meshtasticd
         run: |
           echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
           echo "short=$(./bin/buildinfo.py short)" >> $GITHUB_OUTPUT
@@ -36,27 +50,27 @@ jobs:
       - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
-          name: firmware-debian-${{ steps.version.outputs.long }}-src.zip
+          name: firmware-debian-${{ steps.version.outputs.long }}-src
           merge-multiple: true
 
-      # - name: Install deps
-      #   shell: bash
-      #   run: |
-      #     sudo apt-get update -y --fix-missing
-      #     sudo apt-get install -y dput
-
       - name: Display structure of downloaded files
         run: ls -R
 
-      - name: Publish PPA
+      - name: Publish with dput
         if: ${{ github.event_name != 'pull_request_target' && github.event_name != 'pull_request' }}
-        uses: yuezk/publish-ppa-package@v2
-        with:
-            # See https://launchpad.net/~meshtastic/+archive/ubuntu/meshtastic-daily
-            repository: "meshtastic/meshtastic-daily"
-            gpg_private_key: ${{ secrets.PPA_GPG_PRIVATE_KEY }}
-            tarball: "meshtasticd_${{ steps.version.outputs.short }}.tar.xz"
-            # Supported Ubuntu versions
-            series: "plucky oracular noble jammy"
-            deb_email: "github-actions[bot]@users.noreply.github.com"
-            deb_fullname: "github-actions[bot]"
+        run: |
+          dput ppa:meshtastic/meshtastic-daily meshtasticd_${{ steps.version.outputs.short }}_source.changes
+
+      # - name: Publish PPA
+      #   if: ${{ github.event_name != 'pull_request_target' && github.event_name != 'pull_request' }}
+      #   uses: yuezk/publish-ppa-package@v2
+      #   with:
+      #       # See https://launchpad.net/~meshtastic/+archive/ubuntu/meshtastic-daily
+      #       repository: "meshtastic/meshtastic-daily"
+      #       gpg_private_key: ${{ secrets.PPA_GPG_PRIVATE_KEY }}
+      #       gpg_passphrase: ""
+      #       tarball: "meshtasticd_${{ steps.version.outputs.short }}.tar.xz"
+      #       deb_email: "github-actions[bot]@users.noreply.github.com"
+      #       deb_fullname: "github-actions[bot]"
+      #       # Supported Ubuntu versions
+      #       series: "plucky oracular noble jammy"