Skip to content

Commit

Permalink
Fixed various MacOS Azure pipeline issues, all tests run now.
Browse files Browse the repository at this point in the history
Signed-off-by: Christina Tempelaar-Lietz <xlietz@gmail.com>
  • Loading branch information
xlietz committed Oct 17, 2019
1 parent aef48d6 commit cb16232
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
6 changes: 3 additions & 3 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,12 @@ jobs:
- bash: |
share/ci/scripts/macos/install_python.sh 2.7.16
share/ci/scripts/macos/install_python.sh 3.7.4
share/ci/scripts/macos/install.sh
share/ci/scripts/macos/install_boost.sh
displayName: Install dependencies
- template: share/ci/templates/configure.yml
parameters:
cmakeOpts: ''
cmakeOpts: -DBoost_NO_BOOST_CMAKE=ON

- template: share/ci/templates/build.yml
parameters:
Expand Down Expand Up @@ -170,7 +170,7 @@ jobs:
share/ci/scripts/windows/install_cmake.ps1 3.12.4
share/ci/scripts/windows/install_python.ps1 2.7.16
share/ci/scripts/windows/install_python.ps1 3.7.4
share/ci/scripts/windows/install_boost.ps1 1.70.0
share/ci/scripts/windows/install_boost.ps1 1.66.0
share/ci/scripts/windows/install_zlib.ps1 1.2.11
displayName: Install dependencies
Expand Down
File renamed without changes.
7 changes: 4 additions & 3 deletions share/ci/scripts/macos/install_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ source .bash_profile
env PYTHON_CONFIGURE_OPTS="--enable-framework" pyenv install -v ${PYTHON_VERSION}
pyenv global ${PYTHON_VERSION}

if [[ ${PYTHON_MAJOR}=2 ]]; then
pip install numpy
sudo pip install --upgrade pip
if [[ $PYTHON_MAJOR -eq 2 ]]; then
sudo pip install numpy
else
pip3 install numpy
sudo pip3 install numpy
fi

0 comments on commit cb16232

Please sign in to comment.