Skip to content

Commit

Permalink
Use catalina for osx jobs (#3591)
Browse files Browse the repository at this point in the history
Right now we're only testing in CI that things work on macOS high sierra
but mojave and catalina have been out for a while and different osx versions
differ enough that it warrants testing the newest version works. This
commit switches the osx jobs in the to use catalina. Additionally, azure pipelines
is removing support for the high sierra environment which means we'll have
to migrate to a newer version anyway.

* Add catalina job

Right now we're only testing in CI that things work on macOS high sierra
but catalina has been out for a while and different osx versions differ
enough that it warrants testing that the new version works too. This
commit adds a new catalina job that runs only python 3.7 to verify that
things work on newer osx.

* Update azure-pipelines.yml

Co-Authored-By: Kevin Krsulich <[email protected]>

* Use Mojave for all second stage osx jobs

With the addition of python 3.8 jobs we're running at our job
concurrency limit. To avoid making the run time of ci too long by having
to wait on every commit this commit switches the second stage osx jobs
to use mojave instead of adding duplicated jobs on multiple osx
versions. We'll still use high sierra for the first stage's 3.7 testing
to maintain coverage there.

* Pivot to macos 10.15 catalina

Catalina images have been available on azure pipelines for a few days
now. This commit pivots to using those instead of 10.14 mojave which
have issues with segfaults because of system libraries.

* Use conda for macOS jobs

The pip installable numpy is causing segfaults on catalina and mojave
environments. To workaround this issue this commit switches to using a
conda install for the macos jobs only.

* Install scipy via conda too

* Switch back to 10.14 again

10.15 fails in the same way with or without conda, we've tried 10.14
without conda but not with it. This commit switches back to 10.14 now
that we've switched to using conda to see if the tests pass.

* Switch back to 10.15 without conda

Now that we have a fix for the random segfaulting in the quantum info
tests there shouldn't be a reason we need to keep running in conda. At
the same time this switches back to 10.15 to test the newest version of
macOS. This only reverted back to 10.14 briefly to see if the segfault
was isolated to 10.15, which it was not.

Co-authored-by: Kevin Krsulich <[email protected]>
  • Loading branch information
mtreinish and kdk authored Feb 26, 2020
1 parent 02efd8a commit bca0193
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ stages:
TWINE_PASSWORD: $(TWINE_PASSWORD)
- job: 'macos'
condition: startsWith(variables['Build.SourceBranch'], 'refs/tags')
pool: {vmImage: 'macOS-10.13'}
pool: {vmImage: 'macOS-10.15'}
variables:
python.version: '3.7'
CIBW_BEFORE_BUILD: pip install -U Cython
Expand Down Expand Up @@ -222,8 +222,8 @@ stages:
inputs:
pathtoPublish: 'docs/_build/html'
artifactName: 'html_docs'
- job: 'MacOS_HighSierra_Tests'
pool: {vmImage: 'macOS-10.13'}
- job: 'MacOS_Catalina_Tests'
pool: {vmImage: 'macOS-10.15'}
condition: not(startsWith(variables['Build.SourceBranch'], 'refs/tags'))
strategy:
matrix:
Expand Down Expand Up @@ -386,8 +386,8 @@ stages:
inputs:
testResultsFiles: '**/test-*.xml'
testRunTitle: 'Test results for Linux Python $(python.version)'
- job: 'MacOS_HighSierra_Tests'
pool: {vmImage: 'macOS-10.13'}
- job: 'MacOS_Catalina_Tests'
pool: {vmImage: 'macOS-10.15'}
condition: not(startsWith(variables['Build.SourceBranch'], 'refs/tags'))
strategy:
matrix:
Expand Down

0 comments on commit bca0193

Please sign in to comment.