Skip to content

Commit

Permalink
Merge pull request #3783 from shrijitsingh99/matrix-ci
Browse files Browse the repository at this point in the history
Simplify Ubuntu CI using matrix strategy
  • Loading branch information
taketwo authored Mar 25, 2020
2 parents 811b57c + 7a9a154 commit 373927f
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 53 deletions.
48 changes: 0 additions & 48 deletions .ci/azure-pipelines/build-ubuntu-16-04.yaml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,22 +1,46 @@
resources:
containers:
- container: env1604
image: pointcloudlibrary/env:16.04
- container: env1910
image: pointcloudlibrary/env:19.10

jobs:
- job: ubuntu1910
displayName: Ubuntu 19.10
timeoutInMinutes: 0
- job: ubuntu
displayName: Ubuntu
pool:
vmImage: 'Ubuntu 16.04'
container: env1910
timeoutInMinutes: 0
strategy:
matrix:
# 16.04 Clang:
# containerResource: env1604
# CC: clang
# CXX: clang++
# CMakeArgs: '-DPCL_WARNINGS_ARE_ERRORS=ON'
# 19.10 Clang:
# containerResource: env1910
# CC: clang
# CXX: clang++
# CMakeArgs: ''
16.04 GCC:
containerResource: env1604
CC: gcc
CXX: g++
CMakeArgs: '-DPCL_WARNINGS_ARE_ERRORS=ON'
19.10 GCC:
containerResource: env1910
CC: gcc
CXX: g++
CMakeArgs: ''
container: $[ variables['containerResource'] ]
variables:
BUILD_DIR: '$(Agent.BuildDirectory)/build'
CMAKE_CXX_FLAGS: '-Wall -Wextra -O2'
steps:
- script: |
mkdir $BUILD_DIR && cd $BUILD_DIR
cmake $(Build.SourcesDirectory) \
cmake $(Build.SourcesDirectory) $(CMakeArgs) \
-DCMAKE_BUILD_TYPE="Release" \
-DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS" \
-DPCL_ONLY_CORE_POINT_TYPES=ON \
Expand Down
1 change: 1 addition & 0 deletions .dev/docker/env/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ RUN apt-get update \
&& apt-get install -y \
cmake \
g++ \
clang \
wget \
libboost-date-time-dev \
libboost-filesystem-dev \
Expand Down

0 comments on commit 373927f

Please sign in to comment.