Nit: Make ppa-automation workflow re-runnable (#11034)

* Make ppa-automation workflow re-runnable
* Add --format=gnu when building source bundle

Author: oskirby

.github/workflows/ppa-automation.yaml

@@ -71,7 +71,7 @@ jobs:
 
       - name: Build source bundle
         shell: bash
-        run: ./scripts/linux/script.sh --source --gitref ${GITHUB_REF}
+        run: ./scripts/linux/script.sh --source --gitref ${GITHUB_REF} --version ${GITHUB_RUN_ATTEMPT}
 
       - name: Import signing keys
         id: keys
@@ -109,7 +109,7 @@ jobs:
 
             PACKAGE_SOURCE_NAME=$(dpkg-parsechangelog -l mozillavpn-source/debian/changelog -S Source)
             PACKAGE_BASE_VERSION=$(dpkg-parsechangelog -l mozillavpn-source/debian/changelog -S Version)
-            PACKAGE_DIST_VERSION=${PACKAGE_BASE_VERSION}-${dist}1
+            PACKAGE_DIST_VERSION=${PACKAGE_BASE_VERSION}-${dist}${GITHUB_RUN_ATTEMPT}
 
             dch -c $(pwd)/mozillavpn-source/debian/changelog -v ${PACKAGE_DIST_VERSION} -D ${dist}  "Release for ${dist}"
             (cd mozillavpn-source && dpkg-buildpackage --build=source --sign-key=$KEYID -sa --no-check-builddeps)

scripts/linux/script.sh

@@ -152,7 +152,7 @@ rm -rf $WORKDIR/linux/debian || die "Failed"
 print G "done."
 
 printn Y "Archiving the source code... "
-TAR_OPTIONS="--mtime=$(git log -1 --format=%cI) --owner=root:0 --group=root:0 --sort=name"
+TAR_OPTIONS="--mtime=$(git log -1 --format=%cI) --owner=root:0 --group=root:0 --sort=name --format=gnu"
 LC_ALL=C tar cfz mozillavpn_$SHORTVERSION.orig.tar.gz $TAR_OPTIONS $WORKDIR || die "Failed"
 print G "done."