@@ -46,33 +46,33 @@ matrix:
46
46
- ros_melodic :
47
47
env : ROS_DISTRO="melodic"
48
48
- << : *conan-linux
49
- env : CONAN_GCC_VERSIONS=5 CONAN_DOCKER_IMAGE=conanio/gcc5
49
+ env : CONAN_GCC_VERSIONS=5 CONAN_DOCKER_IMAGE=conanio/gcc5 ROS_DISTRO="none"
50
50
- << : *conan-linux
51
- env : CONAN_GCC_VERSIONS=6 CONAN_DOCKER_IMAGE=conanio/gcc6
51
+ env : CONAN_GCC_VERSIONS=6 CONAN_DOCKER_IMAGE=conanio/gcc6 ROS_DISTRO="none"
52
52
- << : *conan-linux
53
- env : CONAN_GCC_VERSIONS=7 CONAN_DOCKER_IMAGE=conanio/gcc7
53
+ env : CONAN_GCC_VERSIONS=7 CONAN_DOCKER_IMAGE=conanio/gcc7 ROS_DISTRO="none"
54
54
- << : *conan-linux
55
- env : CONAN_GCC_VERSIONS=8 CONAN_DOCKER_IMAGE=conanio/gcc8
55
+ env : CONAN_GCC_VERSIONS=8 CONAN_DOCKER_IMAGE=conanio/gcc8 ROS_DISTRO="none"
56
56
- << : *conan-linux
57
- env : CONAN_CLANG_VERSIONS=3.9 CONAN_DOCKER_IMAGE=conanio/clang39
57
+ env : CONAN_CLANG_VERSIONS=3.9 CONAN_DOCKER_IMAGE=conanio/clang39 ROS_DISTRO="none"
58
58
- << : *conan-linux
59
- env : CONAN_CLANG_VERSIONS=4.0 CONAN_DOCKER_IMAGE=conanio/clang40
59
+ env : CONAN_CLANG_VERSIONS=4.0 CONAN_DOCKER_IMAGE=conanio/clang40 ROS_DISTRO="none"
60
60
- << : *conan-linux
61
- env : CONAN_CLANG_VERSIONS=5.0 CONAN_DOCKER_IMAGE=conanio/clang50
61
+ env : CONAN_CLANG_VERSIONS=5.0 CONAN_DOCKER_IMAGE=conanio/clang50 ROS_DISTRO="none"
62
62
- << : *conan-linux
63
- env : CONAN_CLANG_VERSIONS=6.0 CONAN_DOCKER_IMAGE=conanio/clang60
63
+ env : CONAN_CLANG_VERSIONS=6.0 CONAN_DOCKER_IMAGE=conanio/clang60 ROS_DISTRO="none"
64
64
- << : *conan-osx
65
65
osx_image : xcode8.3
66
- env : CONAN_APPLE_CLANG_VERSIONS=8.1
66
+ env : CONAN_APPLE_CLANG_VERSIONS=8.1 ROS_DISTRO="none"
67
67
- << : *conan-osx
68
68
osx_image : xcode9
69
- env : CONAN_APPLE_CLANG_VERSIONS=9.0
69
+ env : CONAN_APPLE_CLANG_VERSIONS=9.0 ROS_DISTRO="none"
70
70
- << : *conan-osx
71
71
osx_image : xcode9.4
72
- env : CONAN_APPLE_CLANG_VERSIONS=9.1
72
+ env : CONAN_APPLE_CLANG_VERSIONS=9.1 ROS_DISTRO="none"
73
73
- << : *conan-osx
74
74
osx_image : xcode10.1
75
- env : CONAN_APPLE_CLANG_VERSIONS=10.0
75
+ env : CONAN_APPLE_CLANG_VERSIONS=10.0 ROS_DISTRO="none"
76
76
fast_finish : false
77
77
78
78
before_install :
0 commit comments