diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 46a18bcea1..fc2bca5fc0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -45,28 +45,28 @@ jobs: - bash: scripts/ci/azure/run.sh test name: Test -#- job: macos -# timeoutInMinutes: 90 -# strategy: -# matrix: -# macos1014_xcode103_ninja: -# hostImage: 'macOS-10.14' -# macos1015_xcode111_make: -# hostImage: 'macOS-10.15' -# -# pool: -# vmImage: $[ variables['hostImage'] ] -# steps: -# - bash: scripts/ci/azure/macos-setup.sh -# name: Setup -# - bash: scripts/ci/azure/run.sh update -# name: Update -# - bash: scripts/ci/azure/run.sh configure -# name: Configure -# - bash: scripts/ci/azure/run.sh build -# name: Build -# - bash: scripts/ci/azure/run.sh test -# name: Test +- job: macos + timeoutInMinutes: 90 + strategy: + matrix: + macos1014_xcode103_ninja: + hostImage: 'macOS-10.14' + macos1015_xcode111_make: + hostImage: 'macOS-10.15' + + pool: + vmImage: $[ variables['hostImage'] ] + steps: + - bash: scripts/ci/azure/macos-setup.sh + name: Setup + - bash: scripts/ci/azure/run.sh update + name: Update + - bash: scripts/ci/azure/run.sh configure + name: Configure + - bash: scripts/ci/azure/run.sh build + name: Build + - bash: scripts/ci/azure/run.sh test + name: Test - job: linux timeoutInMinutes: 90 diff --git a/scripts/ci/azure/macos-setup.sh b/scripts/ci/azure/macos-setup.sh index b98f781a0d..325cd920cb 100755 --- a/scripts/ci/azure/macos-setup.sh +++ b/scripts/ci/azure/macos-setup.sh @@ -16,14 +16,12 @@ case "$SYSTEM_JOBNAME" in ;; esac -echo "Installing CMake Nightly" -curl -L https://cmake.org/files/dev/cmake-3.16.20191218-g8262562-Darwin-x86_64.tar.gz | sudo tar -C /Applications --strip-components=1 -xz - -echo "Removing all existing brew packages" +echo "Removing all existing brew package and update teh formule" brew remove --force $(brew list) +brew update -echo "Installing Kitware Ninja" -brew install ninja +echo "Installing Kitware CMake and Ninja" +brew install cmake ninja echo "Installing GCC" brew install gcc @@ -31,6 +29,9 @@ brew install gcc echo "Installing blosc compression" brew install c-blosc +echo "Installing python and friends" +brew install python numpy + if [[ "$SYSTEM_JOBNAME" =~ .*openmpi.* ]] then echo "Installing OpenMPI"