From db1f9b759e9cc2f0e8c926c3940009d5945879f5 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Fri, 11 Dec 2020 16:59:53 +0200 Subject: [PATCH] skip brew build in linux and debian build on mac --- bin/build_brew.sh | 13 ++++++++++--- bin/build_deb.sh | 7 +++++++ bin/build_docker.sh | 1 + 3 files changed, 18 insertions(+), 3 deletions(-) mode change 100644 => 100755 bin/build_brew.sh diff --git a/bin/build_brew.sh b/bin/build_brew.sh old mode 100644 new mode 100755 index 9767013d..ec54c90a --- a/bin/build_brew.sh +++ b/bin/build_brew.sh @@ -12,11 +12,18 @@ IFS=$'\n' REPO_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && cd .. && pwd )" + +CURRENT_PLAFORM="$(uname)" +REQUIRED_PLATFORM="Darwin" +if [[ "$CURRENT_PLAFORM" != "$REQUIRED_PLATFORM" ]]; then + echo "[!] Skipping the Homebrew package build on $CURRENT_PLAFORM (it can only be run on $REQUIRED_PLATFORM)." + exit 0 +fi + + cd "$REPO_DIR/brew_dist" - - # make sure archivebox.rb is up-to-date with the dependencies -echo "[+] Building bottle" +echo "[+] Building Homebrew bottle" brew install --build-bottle ./archivebox.rb brew bottle archivebox diff --git a/bin/build_deb.sh b/bin/build_deb.sh index 0c590d71..b9279369 100755 --- a/bin/build_deb.sh +++ b/bin/build_deb.sh @@ -19,6 +19,13 @@ else fi cd "$REPO_DIR" +CURRENT_PLAFORM="$(uname)" +REQUIRED_PLATFORM="Linux" +if [[ "$CURRENT_PLAFORM" != "$REQUIRED_PLATFORM" ]]; then + echo "[!] Skipping the Debian package build on $CURRENT_PLAFORM (it can only be run on $REQUIRED_PLATFORM)." + exit 0 +fi + VERSION="$(jq -r '.version' < "$REPO_DIR/package.json")" DEBIAN_VERSION="1" PGP_KEY_ID="7D5695D3B618872647861D51C38137A7C1675988" diff --git a/bin/build_docker.sh b/bin/build_docker.sh index 025fe350..0115acdf 100755 --- a/bin/build_docker.sh +++ b/bin/build_docker.sh @@ -14,6 +14,7 @@ REPO_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && cd .. && p VERSION="$(jq -r '.version' < "$REPO_DIR/package.json")" cd "$REPO_DIR" +which docker > /dev/null echo "[+] Building docker image in the background..." docker build . -t archivebox \