Skip to content

Commit fe4c32d

Browse files
authored
Update macos on ci (#6334)
- macos 13 images will be retired soon, but macos 15 is now available https://learn.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=macos-images%2Cyaml - split installation of cmake and other homebrew packages (installing cmake via homebrew failed lately because it is already installed some other way)
2 parents 37cc6d2 + c2340b1 commit fe4c32d

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

.ci/azure-pipelines/azure-pipelines.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ stages:
7474
vmImage: '$(VMIMAGE)'
7575
strategy:
7676
matrix:
77-
Ventura 13:
78-
VMIMAGE: 'macOS-13'
79-
OSX_VERSION: '13'
8077
Sonoma 14:
8178
VMIMAGE: 'macOS-14'
8279
OSX_VERSION: '14'
80+
Sequoia 15:
81+
VMIMAGE: 'macOS-15'
82+
OSX_VERSION: '15'
8383
timeoutInMinutes: 0
8484
variables:
8585
BUILD_DIR: '$(Agent.WorkFolder)/build'

.ci/azure-pipelines/build/macos.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ steps:
33
# find the commit hash on a quick non-forced update too
44
fetchDepth: 10
55
- script: |
6-
brew install cmake pkg-config boost eigen flann nanoflann glew libusb qhull vtk glew freeglut qt5 libpcap libomp suite-sparse zlib google-benchmark cjson
6+
brew install cmake
7+
brew install pkg-config boost eigen flann nanoflann glew libusb qhull vtk glew freeglut qt5 libpcap libomp suite-sparse zlib google-benchmark cjson
78
brew install brewsci/science/openni
89
git clone https://github.com/abseil/googletest.git $GOOGLE_TEST_DIR # the official endpoint changed to abseil/googletest
910
cd $GOOGLE_TEST_DIR && git checkout release-1.8.1

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ Continuous integration
2626
[ci-ubuntu-24.04]: https://dev.azure.com/PointCloudLibrary/pcl/_apis/build/status/9?branchName=master&stageName=Build%20GCC&jobName=Ubuntu&configuration=Ubuntu%2024.04%20GCC&label=Ubuntu%2024.04%20GCC
2727
[ci-windows-x86]: https://dev.azure.com/PointCloudLibrary/pcl/_apis/build/status/9?branchName=master&stageName=Build%20MSVC&jobName=Windows%20Build&configuration=Windows%20Build%20x86&label=Windows%20VS2019%20x86
2828
[ci-windows-x64]: https://dev.azure.com/PointCloudLibrary/pcl/_apis/build/status/9?branchName=master&stageName=Build%20MSVC&jobName=Windows%20Build&configuration=Windows%20Build%20x64&label=Windows%20VS2022%20x64
29-
[ci-macos-13]: https://dev.azure.com/PointCloudLibrary/pcl/_apis/build/status/9?branchName=master&stageName=Build%20Clang&jobName=macOS&configuration=macOS%20Ventura%2013&label=macOS%20Ventura%2013
3029
[ci-macos-14]: https://dev.azure.com/PointCloudLibrary/pcl/_apis/build/status/9?branchName=master&stageName=Build%20Clang&jobName=macOS&configuration=macOS%20Sonoma%2014&label=macOS%20Sonoma%2014
30+
[ci-macos-15]: https://dev.azure.com/PointCloudLibrary/pcl/_apis/build/status/9?branchName=master&stageName=Build%20Clang&jobName=macOS&configuration=macOS%20Sequoia%2015&label=macOS%20Sequoia%2015
3131
[ci-docs]: https://dev.azure.com/PointCloudLibrary/pcl/_apis/build/status/Documentation?branchName=master
3232
[ci-latest-docs]: https://dev.azure.com/PointCloudLibrary/pcl/_build/latest?definitionId=14&branchName=master
3333

3434
Build Platform | Status
3535
------------------------ | ------------------------------------------------------------------------------------------------- |
3636
Ubuntu | [![Status][ci-ubuntu-20.04]][ci-latest-build] <br> [![Status][ci-ubuntu-22.04]][ci-latest-build] <br> [![Status][ci-ubuntu-24.04]][ci-latest-build] |
3737
Windows | [![Status][ci-windows-x86]][ci-latest-build] <br> [![Status][ci-windows-x64]][ci-latest-build] |
38-
macOS | [![Status][ci-macos-13]][ci-latest-build] <br> [![Status][ci-macos-14]][ci-latest-build] |
38+
macOS | [![Status][ci-macos-14]][ci-latest-build] <br> [![Status][ci-macos-15]][ci-latest-build] |
3939
Documentation | [![Status][ci-docs]][ci-latest-docs] |
4040
Read the Docs | [![Documentation Status](https://readthedocs.org/projects/pcl-tutorials/badge/?version=master)](https://pcl.readthedocs.io/projects/tutorials/en/master/?badge=master) |
4141

0 commit comments

Comments
 (0)