diff --git a/.github/workflows/main_matrix.yml b/.github/workflows/main_matrix.yml index be8cddaf3..267e34a94 100644 --- a/.github/workflows/main_matrix.yml +++ b/.github/workflows/main_matrix.yml @@ -128,16 +128,6 @@ jobs: with: board: ${{ matrix.board }} - package-ppa: - strategy: - fail-fast: false - matrix: - series: [plucky, oracular, noble, jammy] - uses: ./.github/workflows/package_ppa.yml - with: - series: ${{ matrix.series }} - secrets: inherit - package-raspbian: uses: ./.github/workflows/package_raspbian.yml diff --git a/debian/ci_pack_sdeb.sh b/debian/ci_pack_sdeb.sh index 9ce334859..605ddd288 100755 --- a/debian/ci_pack_sdeb.sh +++ b/debian/ci_pack_sdeb.sh @@ -6,6 +6,9 @@ export PLATFORMIO_CORE_DIR=pio/core # Download libraries to `libdeps` platformio pkg install -e native +platformio pkg install -t tool-scons -e native +tar -cf pio.tar pio/ +rm -rf pio package=$(dpkg-parsechangelog --show-field Source) @@ -14,4 +17,4 @@ dch --create --distribution $SERIES --package $package --newversion $PKG_VERSION "GitHub Actions Automatic packaging for $PKG_VERSION~$SERIES" # Build the source deb -debuild -S -k$GPG_KEY_ID +debuild -S -nc -k$GPG_KEY_ID diff --git a/debian/rules b/debian/rules index 8098c4edb..28961fd10 100755 --- a/debian/rules +++ b/debian/rules @@ -13,6 +13,7 @@ PIO_ENV:=\ override_dh_auto_build: # Build with platformio + tar -xf pio.tar $(PIO_ENV) platformio run -e native # Move the binary and default config to the correct name mv .pio/build/native/program .pio/build/native/meshtasticd diff --git a/debian/source/options b/debian/source/options index 94358cb74..2f3670cba 100644 --- a/debian/source/options +++ b/debian/source/options @@ -1 +1,2 @@ -extend-diff-ignore = "\.pio\w*?$" \ No newline at end of file +extend-diff-ignore = "\.pio\w*?$" +tar-ignore = ""