From: XhmikosR <redacted>
Date: Sun, 5 Apr 2020 07:12:44 +0000 (+0300)
Subject: ci: specify `set -e`
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=e8f9cfb833e2564801357e456c82743d4bd01d5f;p=stevenblack-hosts.git

ci: specify `set -e`
---

diff --git a/ci/install_conda.sh b/ci/install_conda.sh
index f3f45b303..d1b196765 100755
--- a/ci/install_conda.sh
+++ b/ci/install_conda.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 if [ -d "$HOME/miniconda3" ] && [ -e "$HOME/miniconda3/bin/conda" ]; then
     echo "Miniconda install already present in cache: $HOME/miniconda3"
     rm -rf "$HOME"/miniconda3/envs/hosts  # Just in case...
@@ -8,19 +10,19 @@ else
     rm -rf "$HOME"/miniconda3  # Just in case...
 
     if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
-        wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh || exit 1
+        wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh
     else
-        wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh || exit 1
+        wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
     fi
 
-    bash miniconda.sh -b -p "$HOME/miniconda3" || exit 1
+    bash miniconda.sh -b -p "$HOME/miniconda3"
 fi
 
 echo "Configuring Miniconda..."
-conda config --set ssl_verify false || exit 1
-conda config --set always_yes true --set changeps1 false || exit 1
+conda config --set ssl_verify false
+conda config --set always_yes true --set changeps1 false
 
 echo "Updating Miniconda"
 conda update conda
 conda update --all
-conda info -a || exit 1
+conda info -a
diff --git a/ci/lint.sh b/ci/lint.sh
index 0a25aba33..adb9be9ab 100755
--- a/ci/lint.sh
+++ b/ci/lint.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 echo "Linting repository..."
 source activate hosts
 
diff --git a/ci/setup_conda_env.sh b/ci/setup_conda_env.sh
index 467066518..e6a39d427 100755
--- a/ci/setup_conda_env.sh
+++ b/ci/setup_conda_env.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 
+set -e
+
 echo "Creating a Python $PYTHON_VERSION environment"
-conda create -n hosts python="$PYTHON_VERSION" || exit 1
+conda create -n hosts python="$PYTHON_VERSION"
 source activate hosts
 
 echo "Installing packages..."
diff --git a/ci/test.sh b/ci/test.sh
index 0ca8a7f77..4e4d5fbf3 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-echo "Running unittests..."
+set -e
+
+echo "Running unit tests..."
 source activate hosts
 
 python testUpdateHostsFile.py