ci,build: split 'make && make package' commands

For some reason, doing `make && make package` doesn't seem to yield a compiler/build error on Linux. This may be due to how '/bin/sh' interprets command concatenation via '&&'. Splitting the make commands seems to help. See: https://travis-ci.org/github/analogdevicesinc/libiio/builds/661401114 This is essentially branch 'rgetz-review-zeroconfupdates' rebased with this change. Signed-off-by: Alexandru Ardelean <[email protected]>
analogdevicesinc · Mar 13, 2020 · 5a6f85f · 5a6f85f
1 parent 284e10d
commit 5a6f85f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CI/travis/make_darwin b/CI/travis/make_darwin
@@ -9,5 +9,6 @@ ls
 
 cd $TRAVIS_BUILD_DIR/build_tar
 cmake -DOSX_PACKAGE=OFF -DENABLE_PACKAGING=ON -DPYTHON_BINDINGS=ON ..
-make && make package
+make
+make package
 ls
diff --git a/CI/travis/make_linux b/CI/travis/make_linux
@@ -24,7 +24,8 @@ handle_default() {
 	cmake -DENABLE_PACKAGING=ON -DDEB_DETECT_DEPENDENCIES=ON \
 		-DPYTHON_BINDINGS=ON ${DOC_FOUND} ..
 
-	make && make package
+	make
+	make package
 	if [ -n "${GH_DOC_TOKEN}" ] && \
 			[ -f "./generateDocumentationAndDeploy.sh" ] ; then
 		sh generateDocumentationAndDeploy.sh
@@ -36,7 +37,8 @@ handle_centos() {
 	mkdir -p build
 	cd build
 	cmake -DENABLE_PACKAGING=ON -DPYTHON_BINDINGS=ON ..
-	make && make package
+	make
+	make package
 	cd ..
 }