Skip to content

Commit

Permalink
CI: Bump to macos-11 (#900)
Browse files Browse the repository at this point in the history
* Azure: Global MACOSX_DEPLOYMENT_TARGET
  • Loading branch information
alexsavulescu authored Jul 22, 2022
1 parent 884497f commit b99496a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/nmodl-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ jobs:
- config:
flag_warnings: ON
os: ubuntu-22.04
- config:
os: macos-10.15
- config:
os: macos-11
# TODO: might be interesting to add the thread sanitizer too
Expand Down
10 changes: 5 additions & 5 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ variables:
#- ReleaseWheelBuild: False
#- UploadWheel: False
buildWheel: ${{ or(in(variables['Build.Reason'], 'Schedule'), in(variables['Build.Reason'], 'Manual')) }}
MACOSX_DEPLOYMENT_TARGET: 10.14

# Nightly build master for pypi upload
schedules:
Expand Down Expand Up @@ -175,10 +176,10 @@ stages:
env:
CMAKE_PKG: 'cmake-3.15.0-Linux-x86_64'
displayName: 'Build CoreNEURON and Run Integration Tests with ISPC compiler'
- job: 'osx1015'
- job: 'osx11'
pool:
vmImage: 'macOS-10.15'
displayName: 'MacOS (10.15), AppleClang 12.0'
vmImage: 'macOS-11'
displayName: 'MacOS (11), AppleClang 12.0'
steps:
- checkout: self
submodules: True
Expand Down Expand Up @@ -289,7 +290,7 @@ stages:
- job: 'macos_wheels'
timeoutInMinutes: 45
pool:
vmImage: 'macOS-10.15'
vmImage: 'macOS-11'
strategy:
matrix:
${{ if eq(variables.buildWheel, True) }}:
Expand Down Expand Up @@ -332,7 +333,6 @@ stages:
condition: succeeded()
displayName: 'Install Python from python.org'
- script: |
export MACOSX_DEPLOYMENT_TARGET=10.14
export PATH=/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH
export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
if [[ "$(RELEASEWHEELBUILD)" != "True" ]]; then
Expand Down

0 comments on commit b99496a

Please sign in to comment.