ci: update pkgbuilds for ARM, fix bugs (#530)

Fixes some bugs in CI and updates PKGBUILD for ARM.

1 files changed, 33 insertions, 15 deletions

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index 051779a9..c7a0272c 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -75,6 +75,7 @@ jobs:
               os: "ubuntu-18.04",
               target: "x86_64-unknown-linux-gnu",
               cross: false,
+              artifact: true,
             }
           - {
               os: "ubuntu-18.04",
@@ -92,19 +93,21 @@ jobs:
               os: "ubuntu-18.04",
               target: "x86_64-unknown-linux-musl",
               cross: false,
+              artifact: true 
             }
           - {
               os: "ubuntu-18.04",
               target: "i686-unknown-linux-musl",
               cross: true,
             }
-          - { os: "macOS-latest", target: "x86_64-apple-darwin", cross: false }
+          - { os: "macOS-latest", target: "x86_64-apple-darwin", cross: false, artifact: true }
           - {
               os: "windows-2019",
               target: "x86_64-pc-windows-msvc",
               cross: false,
+              artifact: true,
             }
-          - { os: "windows-2019", target: "i686-pc-windows-msvc", cross: false }
+          - { os: "windows-2019", target: "i686-pc-windows-msvc", cross: false, artifact: true }
           - {
               os: "windows-2019",
               target: "x86_64-pc-windows-gnu",
@@ -116,6 +119,7 @@ jobs:
               os: "ubuntu-18.04",
               target: "aarch64-unknown-linux-gnu",
               cross: true,
+              artifact: true
             }
 
           # armv7
@@ -123,6 +127,7 @@ jobs:
               os: "ubuntu-18.04",
               target: "armv7-unknown-linux-gnueabihf",
               cross: true,
+              artifact: true
             }
 
           # PowerPC 64 LE
@@ -231,7 +236,7 @@ jobs:
           asset_content_type: application/octet-stream
 
       - name: Add download asset to artifact if required
-        if: matrix.triple.target == 'x86_64-unknown-linux-musl' || matrix.triple.target == 'x86_64-pc-windows-msvc' || matrix.triple.target == 'i686-pc-windows-msvc' || matrix.triple.target == 'x86_64-apple-darwin'
+        if: matrix.triple.artifact == true
         run: cp ${{ env.ASSET }} artifacts/
 
       - name: Upload artifacts
@@ -244,7 +249,7 @@ jobs:
         if: matrix.triple.target == 'x86_64-pc-windows-msvc'
         shell: powershell
         run: |
-          cargo install cargo-wix
+          cargo install cargo-wix --version 0.3.1 --locked
           cargo wix init
           cargo wix
 
@@ -278,7 +283,7 @@ jobs:
       - name: Build Debian release (Linux x86-64 GNU)
         if: matrix.triple.target == 'x86_64-unknown-linux-gnu' && matrix.triple.container == ''
         run: |
-          cargo install cargo-deb --version 1.29.0
+          cargo install cargo-deb --version 1.29.0 --locked
           cargo deb
           cp ./target/debian/bottom_*.deb ./bottom_${{ env.RELEASE_VERSION }}_amd64.deb
 
@@ -299,25 +304,20 @@ jobs:
           curl -LO "https://github.com/ClementTsang/bottom/archive/${{ env.RELEASE_VERSION }}.tar.gz"
           python "./deployment/packager.py" ${{ env.RELEASE_VERSION }} "./deployment/linux/arch/PKGBUILD.template" "./PKGBUILD" "SHA512" "./${{ env.RELEASE_VERSION }}.tar.gz"
 
-      - name: Build AUR binary PKGBUILD (Linux x86-64 GNU)
+      - name: Tar AUR PKGBUILD (Linux x86-64 GNU)
         if: matrix.triple.target == 'x86_64-unknown-linux-gnu' && matrix.triple.container == ''
         run: |
-          python "./deployment/packager.py" ${{ env.RELEASE_VERSION }} "./deployment/linux/arch/PKGBUILD_BIN.template" "./PKGBUILD_BIN" "SHA512" "./bottom_x86_64-unknown-linux-gnu.tar.gz"
+          tar -czvf arch_PKGBUILD.tar.gz PKGBUILD
 
-      - name: Tar AUR PKGBUILDs
-        if: matrix.triple.target == 'x86_64-unknown-linux-gnu' && matrix.triple.container == ''
-        run: |
-          tar -czvf arch.tar.gz PKGBUILD_BIN PKGBUILD
-
-      - name: Upload AUR PKGBUILDs (Linux x86-64 GNU)
+      - name: Upload AUR PKGBUILD (Linux x86-64 GNU)
         if: matrix.triple.target == 'x86_64-unknown-linux-gnu' && matrix.triple.container == ''
         uses: actions/upload-release-asset@v1.0.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ env.RELEASE_UPLOAD_URL }}
-          asset_path: arch.tar.gz
-          asset_name: arch.tar.gz
+          asset_path: arch_PKGBUILD.tar.gz
+          asset_name: arch_PKGBUILD.tar.gz
           asset_content_type: application/octet-stream
 
   additional-file-generation:
@@ -380,6 +380,24 @@ jobs:
           asset_name: bottom.rb
           asset_content_type: application/octet-stream
 
+      - name: Build AUR PKGBUILD-bin
+        run: |
+          python "./deployment/packager.py" ${{ env.RELEASE_VERSION }} "./deployment/linux/arch/PKGBUILD_BIN.template" "./PKGBUILD" "SHA512" "./artifacts/bottom_x86_64-unknown-linux-gnu.tar.gz" "./artifacts/bottom_aarch64-unknown-linux-gnu.tar.gz" "./artifacts/bottom_armv7-unknown-linux-gnueabihf.tar.gz"
+
+      - name: Tar AUR PKGBUILD-bin
+        run: |
+          tar -czvf arch_PKGBUILD_bin.tar.gz PKGBUILD
+
+      - name: Upload AUR PKGBUILD-bin
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ env.RELEASE_UPLOAD_URL }}
+          asset_path: arch_PKGBUILD_bin.tar.gz
+          asset_name: arch_PKGBUILD_bin.tar.gz
+          asset_content_type: application/octet-stream
+
       - name: Compress completion files (Linux x86-64 GNU)
         if: matrix.triple.target == 'x86_64-unknown-linux-gnu' && matrix.triple.container == ''
         shell: bash