Merge branch 'master' into tft-gui-work

bin/readprops.py

@@ -1,6 +1,7 @@
 import configparser
 import subprocess
-
+import os
+run_number = os.getenv('GITHUB_RUN_NUMBER', '0')
 
 def readProps(prefsLoc):
     """Read the version of our project as a string"""
@@ -29,12 +30,12 @@ def readProps(prefsLoc):
         #     # short for 'dirty', we want to keep our verstrings source for protobuf reasons
         #     suffix = sha + "-d"
         verObj["long"] = "{}.{}".format(verObj["short"], suffix)
-        verObj["deb"] = "{}-ppa{}".format(verObj["short"], sha)
+        verObj["deb"] = "{}-{}~ppa{}".format(verObj["short"], run_number, sha)
     except:
         # print("Unexpected error:", sys.exc_info()[0])
         # traceback.print_exc()
         verObj["long"] = verObj["short"]
-        verObj["deb"] = "{}-ppa".format(verObj["short"])
+        verObj["deb"] = "{}-{}~ppa".format(verObj["short"], run_number)
 
     # print("firmware version " + verStr)
     return verObj

debian/ci_pack_sdeb.sh

@@ -2,7 +2,7 @@
 export DEBEMAIL="jbennett@incomsystems.biz"
 export PLATFORMIO_LIBDEPS_DIR=pio/libdeps
 export PLATFORMIO_PACKAGES_DIR=pio/packages
-export PLATFORMIO_CORE_DIR=.pio_core
+export PLATFORMIO_CORE_DIR=pio/core
 
 # Download libraries to `libdeps`
 platformio pkg install -e native

debian/rules

@@ -7,7 +7,7 @@
 
 # https://docs.platformio.org/en/latest/envvars.html
 PIO_ENV:=\
-	PLATFORMIO_CORE_DIR=.pio_core \
+	PLATFORMIO_CORE_DIR=pio/core \
 	PLATFORMIO_LIBDEPS_DIR=pio/libdeps \
 	PLATFORMIO_PACKAGES_DIR=pio/packages
 

debian/source/include-binaries

@@ -1,2 +1,3 @@
 pio/libdeps
-pio/packages
+pio/packages
+pio/core