Skip to content

Commit

Permalink
Update pipeline to newer docker images. (#5807)
Browse files Browse the repository at this point in the history
* Update vmImage to 22.04.�Update builds to use 20.04 as lowest supported ubuntu and 23.04 as highest.�Updated Clang builds to use 22.04.

* Disable GPU build on clang, due to nvcc defaults to gcc.

* Remove comment

* Update ci status on readme page.
  • Loading branch information
larshg authored Sep 21, 2023
1 parent 90fda41 commit b5ce8f5
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
30 changes: 15 additions & 15 deletions .ci/azure-pipelines/azure-pipelines.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ resources:
image: pointcloudlibrary/env:winx86
- container: winx64
image: pointcloudlibrary/env:winx64
- container: env1804
image: pointcloudlibrary/env:18.04
- container: env2004
image: pointcloudlibrary/env:20.04
- container: env2204
image: pointcloudlibrary/env:22.04
- container: env2304
image: pointcloudlibrary/env:23.04

stages:
- stage: formatting
Expand All @@ -40,20 +40,20 @@ stages:
- job: ubuntu
displayName: Ubuntu
pool:
vmImage: 'Ubuntu 20.04'
vmImage: 'ubuntu-22.04'
strategy:
matrix:
18.04 GCC: # oldest LTS
CONTAINER: env1804
20.04 GCC: # oldest LTS
CONTAINER: env2004
CC: gcc
CXX: g++
BUILD_GPU: ON
CMAKE_ARGS: '-DPCL_WARNINGS_ARE_ERRORS=ON'
22.04 GCC: # latest Ubuntu
CONTAINER: env2204
23.04 GCC: # latest Ubuntu
CONTAINER: env2304
CC: gcc
CXX: g++
BUILD_GPU: OFF # There are currently incompatibilities between GCC 11.2 and CUDA 11.5
BUILD_GPU: ON
container: $[ variables['CONTAINER'] ]
timeoutInMinutes: 0
variables:
Expand Down Expand Up @@ -95,14 +95,14 @@ stages:
dependsOn: osx
condition: succeededOrFailed()
pool:
vmImage: 'Ubuntu 20.04'
vmImage: 'ubuntu-22.04'
strategy:
matrix:
20.04 Clang:
CONTAINER: env2004
22.04 Clang:
CONTAINER: env2204
CC: clang
CXX: clang++
BUILD_GPU: ON
BUILD_GPU: OFF # There are currently incompatibilities between GCC 11.2 and CUDA 11.5 (Ubuntu 22.04)
CMAKE_ARGS: ''
container: $[ variables['CONTAINER'] ]
timeoutInMinutes: 0
Expand All @@ -118,11 +118,11 @@ stages:
dependsOn: osx
condition: succeededOrFailed()
pool:
vmImage: 'Ubuntu 20.04'
vmImage: 'ubuntu-22.04'
strategy:
matrix:
20.04 Clang:
CONTAINER: env2004
22.04 Clang:
CONTAINER: env2204
CC: clang
CXX: clang++
INDEX_SIGNED: OFF
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ If you really need access to the old website, please use [the copy made by the i
Continuous integration
----------------------
[ci-latest-build]: https://dev.azure.com/PointCloudLibrary/pcl/_build/latest?definitionId=9&branchName=master
[ci-ubuntu-18.04]: https://dev.azure.com/PointCloudLibrary/pcl/_apis/build/status/9?branchName=master&stageName=Build%20GCC&jobName=Ubuntu&configuration=Ubuntu%2018.04%20GCC&label=Ubuntu%2018.04%20GCC
[ci-ubuntu-20.04]: https://dev.azure.com/PointCloudLibrary/pcl/_apis/build/status/9?branchName=master&stageName=Build%20Clang&jobName=Ubuntu&configuration=Ubuntu%2020.04%20Clang&label=Ubuntu%2020.04%20Clang
[ci-ubuntu-22.04]: https://dev.azure.com/PointCloudLibrary/pcl/_apis/build/status/9?branchName=master&stageName=Build%20GCC&jobName=Ubuntu&configuration=Ubuntu%2022.04%20GCC&label=Ubuntu%2022.04%20GCC
[ci-ubuntu-23.04]: https://dev.azure.com/PointCloudLibrary/pcl/_apis/build/status/9?branchName=master&stageName=Build%20GCC&jobName=Ubuntu&configuration=Ubuntu%2022.04%20GCC&label=Ubuntu%2023.04%20GCC
[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
[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%20VS2019%20x64
[ci-macos-11]: https://dev.azure.com/PointCloudLibrary/pcl/_apis/build/status/9?branchName=master&stageName=Build%20Clang&jobName=macOS&configuration=macOS%20Big%20Sur%2011&label=macOS%20Big%20Sur%2011
Expand Down

0 comments on commit b5ce8f5

Please sign in to comment.