Merge pull request #3329 from efuss/fix-3311

[collectd.git] / .cirrus.yml

diff --git a/.cirrus.yml b/.cirrus.yml
index 8d649f9..ab88daf 100644 (file)
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -79,10 +79,6 @@ redhat_default_toolchain_task:
     - allow_failures: true
       skip_notifications: true
       container:
-        image: collectd/ci:fedora26_x86_64
-    - allow_failures: true
-      skip_notifications: true
-      container:
         image: collectd/ci:fedora28_x86_64
     # fedora/rawhide is expected to fail
     - allow_failures: true
@@ -121,7 +117,7 @@ non_standard_toolchains_task:
         - ./build.sh
         - clang --version
         - >
-          ./configure CC=clang
+          ./configure CC=clang CXX=clang++
           $DEFAULT_CONFIG_OPTS
           CFLAGS="$(dpkg-buildflags --get CFLAGS)"
           CPPLAGS="$(dpkg-buildflags --get CPPFLAGS)"
@@ -155,25 +151,6 @@ non_standard_toolchains_task:
             fi
           done
 
-    # build against musl-libc using gcc wrapper, expected to fail
-    - env:
-        LABEL: musl libc
-      allow_failures: true
-      skip_notifications: true
-      configure_script:
-        - ./build.sh
-        - musl-gcc --version
-        - >
-          ./configure CC=musl-gcc
-          $DEFAULT_CONFIG_OPTS
-          CFLAGS="$(dpkg-buildflags --get CFLAGS)"
-          CPPLAGS="$(dpkg-buildflags --get CPPFLAGS)"
-          LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"
-      build_script:
-        - make -j2 -sk
-      tests_script:
-        - make -j2 -sk check
-
     # build using clang with a collection of strict build flags, will most
     # probably always fail
     - env:
@@ -184,7 +161,7 @@ non_standard_toolchains_task:
         - ./build.sh
         - clang --version
         - >
-          ./configure CC=clang
+          ./configure CC=clang CXX=clang++
           $DEFAULT_CONFIG_OPTS
           CFLAGS='-Wall
           -Wno-error