From ad48b85a440dd064350e489e9fcb2c56fb057b1a Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 30 Nov 2017 00:18:11 +0200 Subject: [PATCH 1/2] Fix sudo command for OSX CI --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 91b9caa0..914f1194 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ matrix: install: - git submodule update --init --recursive - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo python -c "$(curl -fsSL https://bootstrap.pypa.io/get-pip.py)"; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl -fsSL https://bootstrap.pypa.io/get-pip.py | sudo python; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo pip install -U tox; else pip install -U tox; fi # ChipKIT issue: install 32-bit support for GCC PIC32 From d0e32ebcb5285dc096f1a5b5d7dd38e7bd9072ec Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 30 Nov 2017 02:05:14 +0200 Subject: [PATCH 2/2] CI OSX: Don't upgrade system Python packages --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 914f1194..07e019a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ matrix: install: - git submodule update --init --recursive - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl -fsSL https://bootstrap.pypa.io/get-pip.py | sudo python; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo pip install -U tox; else pip install -U tox; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo pip install tox; else pip install -U tox; fi # ChipKIT issue: install 32-bit support for GCC PIC32 - if [[ "$TOX_ENV" == "py27" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libc6-i386; fi