Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Azure macOS job fixes #582

Merged
merged 1 commit into from
Oct 17, 2019
Merged

Azure macOS job fixes #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions azure-pipelines.yml
View file
Open in desktop
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
0 share/ci/scripts/macos/install.sh → share/ci/scripts/macos/install_boost.sh
View file
Open in desktop
File renamed without changes.
7 changes: 4 additions & 3 deletions share/ci/scripts/macos/install_python.sh
View file
Open in desktop
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