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

Move Azure builds to OSX 10.15. #7639

Closed
wants to merge 13 commits into from
Closed

Move Azure builds to OSX 10.15. #7639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8558931
Move Azure builds to OSX 10.15.
stuartarchibald Dec 9, 2021
4fc6ddc
try exporting the osx sdk version for CI
esc Dec 10, 2021
95b8e1b
export the osx version directly in the build script
esc Dec 10, 2021
8fcd2b4
try exporting the SDK root
esc Dec 10, 2021
c4e3a69
try setting the OSX_SDK_DIR
esc Dec 10, 2021
440724e
add plutil magic and special case OSX
esc Dec 10, 2021
f90c02a
use conda instead of source
esc Dec 10, 2021
77a446a
fiddle with conda activation
esc Dec 10, 2021
e1edf50
random guessing
esc Dec 10, 2021
8259dc2
test setting MACOSX_DEPLOYMENT_TARGET
seibert Dec 10, 2021
40cef96
try using system compilers instead
esc Dec 13, 2021
4a1f9c1
fix shell syntax
esc Dec 13, 2021
07cf1ef
try BigSur
esc Dec 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- template: buildscripts/azure/azure-linux-macos.yml
parameters:
name: macOS
vmImage: macOS-10.14
vmImage: macOS-11
matrix:
py37_np118:
PYTHON: '3.7'
Expand Down
1 change: 1 addition & 0 deletions buildscripts/azure/azure-linux-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:

- script: |
export PATH=$HOME/miniconda3/bin:$PATH
export MACOSX_SDK_VERSION=10.15
buildscripts/incremental/build.sh
displayName: 'Build'

Expand Down
13 changes: 12 additions & 1 deletion buildscripts/incremental/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/bash

source activate $CONDA_ENV
source activate
conda activate $CONDA_ENV

# Make sure any error below is reported as such
set -v -e
Expand All @@ -12,6 +13,16 @@ else
EXTRA_BUILD_EXT_FLAGS=""
fi

if [[ $(uname) == "Darwin" ]]; then
export MACOSX_SDK_VERSION=10.15
export MACOSX_DEPLOYMENT_TARGET=10.15
export SDKROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
export OSX_SDK_DIR="$(xcode-select -p)/Platforms/MacOSX.platform/Developer/SDKs"
export USING_SYSTEM_SDK_DIR=1
export CPATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include
plutil -replace MinimumSDKVersion -string ${MACOSX_SDK_VERSION} $(xcode-select -p)/Platforms/MacOSX.platform/Info.plist
plutil -replace DTSDKName -string macosx${MACOSX_SDK_VERSION}internal $(xcode-select -p)/Platforms/MacOSX.platform/Info.plist
fi
python setup.py build_ext -q --inplace --debug $EXTRA_BUILD_EXT_FLAGS
# (note we don't install to avoid problems with extra long Windows paths
# during distutils-dependent tests -- e.g. test_pycc)
Expand Down
7 changes: 4 additions & 3 deletions buildscripts/incremental/setup_conda_environment.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,10 @@ if [[ $(uname) == Linux ]]; then
$CONDA_INSTALL gcc_linux-64 gxx_linux-64
fi
elif [[ $(uname) == Darwin ]]; then
$CONDA_INSTALL clang_osx-64 clangxx_osx-64
# Install llvm-openmp and intel-openmp on OSX too
$CONDA_INSTALL llvm-openmp intel-openmp
#$CONDA_INSTALL clang_osx-64 clangxx_osx-64
## Install llvm-openmp and intel-openmp on OSX too
#$CONDA_INSTALL llvm-openmp intel-openmp
echo "using system compilers"
fi

# `pip install` all the dependencies on Python 3.10
Expand Down