From bd95b4ff18b5250bb2b16aef5c26a50f027c7784 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Tue, 3 Nov 2020 16:24:52 +0200 Subject: [PATCH 1/4] cd/travis/lib.sh: don't use '-y' param for homebrew package manager In recent versions, the '-y' argument isn't working/recognized and causes the build to fail. Don't use it for Homebrew, since it's not required. Signed-off-by: Alexandru Ardelean --- ci/travis/lib.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ci/travis/lib.sh b/ci/travis/lib.sh index 9f787a9..5d43d52 100644 --- a/ci/travis/lib.sh +++ b/ci/travis/lib.sh @@ -13,16 +13,22 @@ command_exists() { ensure_command_exists() { local cmd="$1" local package="$2" + local yes_confirm [ -n "$cmd" ] || return 1 [ -n "$package" ] || package="$cmd" ! command_exists "$cmd" || return 0 # go through known package managers for pacman in apt-get brew yum ; do command_exists $pacman || continue - $pacman install -y $package || { + if [ "$pacman" = "brew" ] ; then + yes_confirm= + else + yes_confirm="-y" + fi + "$pacman" install $yes_confirm "$package" || { # Try an update if install doesn't work the first time - $pacman -y update && \ - $pacman install -y $package + "$pacman" $yes_confirm update && \ + "$pacman" install $yes_confirm "$package" } return $? done From 3fda2ffed3fbc346fddcee108ccbec2173ac7354 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Wed, 9 Dec 2020 17:02:33 +0200 Subject: [PATCH 2/4] ci,travis: rename file to disable build These builds haven't been working in a while. Remove them. Signed-off-by: Alexandru Ardelean --- .travis.yml => .travis.yml.bak | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .travis.yml => .travis.yml.bak (100%) diff --git a/.travis.yml b/.travis.yml.bak similarity index 100% rename from .travis.yml rename to .travis.yml.bak From 9f18091d4c6a50f101ee7bd56ed3b8b724122eff Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Fri, 23 Oct 2020 16:28:07 +0300 Subject: [PATCH 3/4] ci/travis/before_install_darwin: remove tracing Seems it was forgotten Signed-off-by: Alexandru Ardelean --- ci/travis/before_install_darwin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/travis/before_install_darwin b/ci/travis/before_install_darwin index 07c872f..77f681e 100755 --- a/ci/travis/before_install_darwin +++ b/ci/travis/before_install_darwin @@ -1,4 +1,4 @@ -#!/bin/sh -xe +#!/bin/sh -e . ci/travis/lib.sh . ci/travis/before_install_lib.sh From 88089fcb866be17c71e3f8e0ca66a72393c23594 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Tue, 20 Oct 2020 08:09:21 +0300 Subject: [PATCH 4/4] python/iio/attr_update.py: make it compile-able on Python3 In order for this script to compile on Python3, the print function needs round braces. Signed-off-by: Alexandru Ardelean --- python/iio/attr_updater.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/iio/attr_updater.py b/python/iio/attr_updater.py index b0f8711..f64b119 100644 --- a/python/iio/attr_updater.py +++ b/python/iio/attr_updater.py @@ -71,7 +71,7 @@ def sender(self): try: self.message_port_pub(self.port, msg_dic) except: - print "Error: Failed to publish message" + print("Error: Failed to publish message") return sleep(self.interval/1000)