ci: Add extra build targets on release (#283)

3 files changed, 13 insertions, 17 deletions

diff --git a/.travis.yml b/.travis.yml
index 1746dd9d..28c603a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ notifications:
 
 matrix:
   include:
-    # Standard x86-64 stuff, stable and beta
+    # Standard x86-64 stuff, stable and beta, on tier-1 environments
     - os: linux
       env: TARGET=x86_64-unknown-linux-gnu
       arch: amd64
@@ -50,7 +50,6 @@ matrix:
       rust: stable
 
     # ARM stuff (skip beta for now, see https://github.com/rust-lang/rust/issues/62896)
-    # TODO: [ARM] Support ARM binary generation...?
     - os: linux
       env: TARGET=aarch64-unknown-linux-gnu
       arch: arm64
@@ -70,10 +69,6 @@ matrix:
   exclude:
     - if: tag IS present
       rust: beta
-    - if: tag IS present
-      arch: arm64
-    - if: tag IS present
-      env: TARGET=armv7-unknown-linux-gnueabihf
   # allow_failures:
   #   - arch: arm64 # ARM will be run, but support is still gonna be limited for now... may change.
   #   - env: TARGET=armv7-unknown-linux-gnueabihf
@@ -119,7 +114,6 @@ script:
       cargo test --verbose --target $TARGET  
     fi
 
-# FIXME: [TRAVIS] Probably want to update this with the new build targets and all.
 before_deploy:
   - |
     echo "Test whether installing works.  This is mostly just a sanity check.";
@@ -127,17 +121,18 @@ before_deploy:
   - |
     echo "Building release..."
     if [[ $TRAVIS_OS_NAME == "windows" ]]; then
-      echo "Building Windows 64-bit...";
+      echo "Building Windows 64-bit, target: $TARGET...";
       cargo build --release --target $TARGET;
       local target_dir=$(ls target/release/build/bottom-*/out/rg.bash | head -n1 | xargs dirname)
       cp -r $target_dir completions
-      mv "./target/x86_64-pc-windows-msvc/release/btm" "btm.exe";
+      mv "./target/$TARGET/release/btm" "btm.exe";
       strip "btm.exe"
-      zip -r bottom_x86_64-pc-windows-msvc.zip "btm.exe" "completions";
+      zip -r bottom_$TARGET.zip "btm.exe" "completions";
       rm "btm.exe"
       rm -r "completions"
 
       if [[ $TARGET == "x86_64-pc-windows-msvc" ]]; then
+        echo "Building further results for x86_64-pc-windows-msvc target..."
         echo "Building Windows 32-bit...";
         cargo clean;
         cargo build --release --target i686-pc-windows-msvc;
@@ -167,7 +162,7 @@ before_deploy:
 
       echo "Done Windows pre-deploy!";
     else
-        echo "Building release for macOS/Linux...";
+        echo "Building release for macOS/Linux, target: $TARGET";
         cargo build --release;
         cp ./target/release/btm btm;
         strip btm;
@@ -176,7 +171,8 @@ before_deploy:
         echo "Tar-ing macOS/Linux binary and completions..."
         tar -czvf bottom_$TARGET.tar.gz btm completions;
 
-        if [[ $TRAVIS_OS_NAME == "linux" ]]; then
+        if [[ $TRAVIS_OS_NAME == "linux" && $TARGET == "x86_64-unknown-linux-gnu" ]]; then
+          echo "Building further results for x86_64-unknown-linux-gnu..."
           echo "Generating AUR template...";
           python "./deployment/packager.py" $TRAVIS_TAG "./deployment/linux/arch/PKGBUILD_BIN.template" "./PKGBUILD_BIN" "SHA512" "./bottom_x86_64-unknown-linux-gnu.tar.gz";
           curl -LO "https://github.com/ClementTsang/bottom/archive/$TRAVIS_TAG.tar.gz";
@@ -193,9 +189,6 @@ before_deploy:
           cargo install cargo-deb;
           cargo deb;
           cp ./target/debian/bottom_*.deb .;
-        elif [[ $TRAVIS_OS_NAME == "osx" ]]; then
-          # The bottom.rb file must be generated AFTER, since it relies on the Linux binary file.
-        fi
 
         echo "Done macOS/Linux pre-deploy!";
     fi
diff --git a/.vscode/settings.json b/.vscode/settings.json
index dd8c5e7a..10a7de47 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -61,6 +61,7 @@
     "htop",
     "indexmap",
     "keybinds",
+    "le",
     "libc",
     "markdownlint",
     "memb",
@@ -74,6 +75,8 @@
     "paren",
     "pids",
     "pmem",
+    "powerpc",
+    "powerpc le",
     "ppid",
     "prepush",
     "processthreadsapi",
diff --git a/README.md b/README.md
index 2ee0b2d6..07caa767 100644
--- a/README.md
+++ b/README.md
@@ -66,8 +66,7 @@ Note that bottom is:
 - Officially tested and released for only `x86_64` (and `i686` for Windows)
 - Developed mainly for macOS, Windows, and Linux
 
-As such, support beyond that is not guaranteed. There is now _technically_ support for AArch64 and ARMv7 builds and it is tested on Travis,
-but I won't be officially supporting it for a bit and some things may or may not work (for example, R/s and W/s for disks doesn't work).
+Anything outside of this (i.e: ARM builds, building on Nightly, building on another OS) is currently not guaranteed, even if it does happen to work. For example, ARM is tested against on Travis and release builds are supported, but not all features will work (such as R/s and W/s for disks).
 
 ### Manually
 
@@ -718,6 +717,7 @@ Thanks to all contributors ([emoji key](https://allcontributors.org/docs/en/emoj
 
 <!-- markdownlint-enable -->
 <!-- prettier-ignore-end -->
+
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 ## Thanks