diff options
author | Roman Perepelitsa <roman.perepelitsa@gmail.com> | 2020-06-13 12:15:44 +0300 |
---|---|---|
committer | Roman Perepelitsa <roman.perepelitsa@gmail.com> | 2020-06-13 12:15:44 +0300 |
commit | 4d14f9e0ba94770c55b28c2839c71dda47f97d9c (patch) | |
tree | 95f588831e52a0eaa61c8d98a19e3c03e44ffd34 /gitstatus/mbuild | |
parent | faa510d54c30b9384ee7f4a95b9d04f5c6a8cf62 (diff) | |
parent | b0158178925484c058e6175e174b639237532c63 (diff) |
Merge commit 'b0158178925484c058e6175e174b639237532c63'
Diffstat (limited to 'gitstatus/mbuild')
-rwxr-xr-x | gitstatus/mbuild | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gitstatus/mbuild b/gitstatus/mbuild index cf4bc008..7d98b1fb 100755 --- a/gitstatus/mbuild +++ b/gitstatus/mbuild @@ -117,6 +117,7 @@ local -rA assets=( linux-armv6l build-linux-armv7l linux-armv7l build-linux-armv7l linux-i686 build-linux-x86_64 + linux-ppc64le build-linux-ppc64le linux-x86_64 build-linux-x86_64 ) @@ -180,14 +181,15 @@ local build=' function build-unix() { local intro flags=(-sw) case $2 in - darwin-*) intro='PATH="/usr/local/bin:$PATH"';; + linux-ppc64le);; linux-*) flags+=(-d docker);; + darwin-*) intro='PATH="/usr/local/bin:$PATH"';; esac ssh $1 -- /bin/sh -uex <<<" $intro cd /tmp $build ${2##*-} ${(j: :)${(@q)flags}}" - scp $1:/tmp/gitstatus/usrbin/gitstatusd-$2 $binaries/ + scp $1:/tmp/gitstatus/usrbin/gitstatusd $binaries/gitstatusd-$2 } function build-windows() { @@ -236,7 +238,7 @@ function build-windows() { while true; do IFS= read -u $fd -r line || return 0 if [[ $line == *"warning: terminate MSYS2"* ]]; then - # At this point the machine is hosed. Rogue process with corrupted name + # At this point the machine is hosed. A rogue process with a corrupted name # is eating all CPU. The top SSH connection won't terminate on its own. ssh $1 powershell.exe <<<'Restart-Computer -Force' || true sleep 30 @@ -260,7 +262,7 @@ function build-windows() { cd -- $tmp $build ${2##*-} ${(j: :)${(@q)flags}} exit" - scp $1:$c/tmp/gitstatus/usrbin/gitstatusd-$2 $binaries/ + scp $1:$c/tmp/gitstatus/usrbin/gitstatusd $binaries/gitstatusd-$2 chmod +x $binaries/gitstatusd-$2 } @@ -272,7 +274,7 @@ function build() ( zsystem flock $locks/$machine build-${protocol[(k)$platform]} $machine $platform local tmp=gitstatusd-$platform.tmp.$$.tar.gz - ( cd -q -- $binaries; GZIP=-9 tar -czf $tmp gitstatusd-$platform ) + ( cd -q -- $binaries; tar --owner=0 --group=0 -I 'gzip -9' -cf $tmp gitstatusd-$platform ) mv -f -- $binaries/$tmp $binaries/gitstatusd-$platform.tar.gz ) |