Unverified Commit 65672577 authored by Matthew Brett's avatar Matthew Brett Committed by GitHub
Browse files

Merge pull request #388 from isuruf/sdk

Select the correct SDK for github CI and azure pipelines
parents 63c1418e 4ce0414c
...@@ -2,6 +2,20 @@ ...@@ -2,6 +2,20 @@
# Wheel build, install, run test steps on OSX # Wheel build, install, run test steps on OSX
set -e set -e
if [ "$PLAT" == "arm64" ] || [ "$PLAT" == "universal2" ]; then
if [[ "$(xcrun -show-sdk-version)" == 10.* ]]; then
latestXcode=$(ls /Applications | grep Xcode[_0-9\.]*\.app | sort -V | tail -n 1)
if ([ "$GITHUB_WORKFLOW" != "" ] || [ "$PIPELINE_WORKSPACE" != "" ]) && [ $latestXcode ]; then
sudo xcode-select -switch /Applications/$latestXcode.app
fi
if [[ "$(xcrun -show-sdk-version)" == 10.* ]]; then
echo "Need SDK>=11 for arm64 builds. Please run xcode-select to select a newer SDK"
exit 1
fi
fi
export SDKROOT=${SDKROOT:-$(xcrun -show-sdk-path)}
fi
# Get needed utilities # Get needed utilities
MULTIBUILD_DIR=$(dirname "${BASH_SOURCE[0]}") MULTIBUILD_DIR=$(dirname "${BASH_SOURCE[0]}")
MB_PYTHON_VERSION=${MB_PYTHON_VERSION:-$TRAVIS_PYTHON_VERSION} MB_PYTHON_VERSION=${MB_PYTHON_VERSION:-$TRAVIS_PYTHON_VERSION}
......
...@@ -5,7 +5,7 @@ WHEEL_SDIR=${WHEEL_SDIR:-wheelhouse} ...@@ -5,7 +5,7 @@ WHEEL_SDIR=${WHEEL_SDIR:-wheelhouse}
MULTIBUILD_DIR=$(dirname "${BASH_SOURCE[0]}") MULTIBUILD_DIR=$(dirname "${BASH_SOURCE[0]}")
if [ ! -d "$PWD/$WHEEL_SDIR" ]; then mkdir $PWD/$WHEEL_SDIR; fi if [ ! -d "$PWD/$WHEEL_SDIR" ]; then mkdir $PWD/$WHEEL_SDIR; fi
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then if [[ "$(uname)" == "Darwin" ]]; then
source $MULTIBUILD_DIR/travis_osx_steps.sh source $MULTIBUILD_DIR/travis_osx_steps.sh
else else
source $MULTIBUILD_DIR/travis_linux_steps.sh source $MULTIBUILD_DIR/travis_linux_steps.sh
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment