support ppa on linux ci

2 files changed, 25 insertions, 18 deletions

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 0475978a1..bd357fab7 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -34,7 +34,7 @@ jobs:
         # build artifacts
       - name: artifact
         run: |
-          sudo apt-get install -y ruby ruby-dev rubygems build-essential
+          sudo apt install -y ruby ruby-dev rubygems build-essential
           sudo gem install --no-document fpm
           scripts/makepkg deb 
         # upload artifacts
@@ -55,3 +55,20 @@ jobs:
           asset_name: xmake-${{ steps.tagName.outputs.tag }}.amd64.deb
           asset_content_type: application/zip
 
+      - name: publish
+        if: github.event.action == 'published'
+        env:
+          PPA_GPG_PRIKEY_2C0C68C9: ${{ secrets.PPA_GPG_PRIKEY_2C0C68C9 }}
+        run: |
+          # upload ubuntu/ppa
+          sudo apt install -y dh-make rng-tools devscripts lintian
+          echo "$PPA_GPG_PRIKEY_2C0C68C9" > ppa_gpg.key
+          gpg --import ppa_gpg.key
+          scripts/makeppa groovy  
+          scripts/makeppa focal 
+          scripts/makeppa bionic 
+          scripts/makeppa xenial  
+          scripts/makeppa trusty  
+          scripts/makeppa precise  
+
+
diff --git a/scripts/makeppa b/scripts/makeppa
index 8615f916c..0af565bc9 100755
--- a/scripts/makeppa
+++ b/scripts/makeppa
@@ -50,7 +50,7 @@ echo "making template .."
 if [ -d debian ]; then
     rm -rf debian
 fi
-export USER=ruki
+export USER=`id -u -n`
 dh_make -e [email protected] -c apache -y -s -f ../$basename.tar.gz
 
 # copy debian
@@ -74,26 +74,16 @@ echo "checking package .."
 lintian ../xmake_$version+$patch$serie.dsc
 
 # upload package
+echo "uploading package .."
 source=xmake_$version+"$patch$serie"_source
-while true; do
-    read -p "Do you wish to upload this package? (y/n)" yn
-    case $yn in
-        [Yy]* ) if [ -f ../$source.ppa.upload ]; then rm ../$source.ppa.upload; fi ; dput ppa:xmake-io/xmake ../$source.changes; break;;
-        [Nn]* ) exit;;
-        * ) echo "Please answer y or n.";;
-    esac
-done
+if [ -f ../$source.ppa.upload ]; then 
+    rm ../$source.ppa.upload
+fi
+dput ppa:xmake-io/xmake ../$source.changes
 
 # remove workdir
 cd ../..
-while true; do
-    read -p "Do you wish to remove working directory? (y/n)" yn
-    case $yn in
-        [Yy]* ) rm -rf xmake-ppa; break;;
-        [Nn]* ) exit;;
-        * ) echo "Please answer y or n.";;
-    esac
-done
+rm -rf xmake-ppa
 
 # install dh-make and gpg
 # sudo apt install dh-make rng-tools