Improve cirrus build

diff --git a/.cirrus.yml b/.cirrus.yml
index c5266e21452fda03561603f9276aaf06c5564135..15c3cba92efe3c981cf8b4ed6ff5d0a77e7a9bfe 100644 (file)
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,14 +1,22 @@
 env:
   CIRRUS_CLONE_DEPTH: 1
   ARCH: amd64
-  CPPFLAGS: -I/usr/local/include
-  LDFLAGS: -L/usr/local/lib
 
 task:
-  freebsd_instance:
-    matrix:
+  matrix:
+    freebsd_instance:
       image: freebsd-12-0-release-amd64
+    freebsd_instance:
       image: freebsd-11-2-release-amd64
+    osx_instance:
+      image: mojave-xcode-10.1
+    osx_instance:
+      image: high-sierra-xcode-10.0
+  matrix:
+    env:
+      BUILD_SYSTEM: autotools
+    env:
+      BUILD_SYSTEM: cmake
   install_script:
     - ./build/ci/cirrus_ci.sh install
   script:

diff --git a/build/ci/cirrus_ci.sh b/build/ci/cirrus_ci.sh
index 521402df6fbbfea089805914788fd6e37cb44a59..ae8a1a716044262469756cb735a9c8758cac435e 100755 (executable)
--- a/build/ci/cirrus_ci.sh
+++ b/build/ci/cirrus_ci.sh
@@ -13,16 +13,20 @@ then
                tunefs -N enable /dev/$MD
                mount /dev/$MD /tmp_acl_nfsv4
                chmod 1777 /tmp_acl_nfsv4
-               pkg install -y autoconf automake libiconv libtool pkgconf expat libxml2 liblz4 zstd
+               pkg install -y autoconf automake cmake libiconv libtool pkgconf expat libxml2 liblz4 zstd
        elif [ "$UNAME" = "Darwin" ]
        then
                set -x -e
                brew update
-               brew install xz lz4 zstd
+               brew install autoconf automake libtool pkg-config cmake xz lz4 zstd
+       elif [ "$UNAME" = "Linux" -a -f /etc/debian_version ]
+       then
+               apt-get -y update
+               apt-get -y install build-essential automake libtool bison sharutils pkgconf libacl1-dev libbz2-dev libzip-dev zlib1g-dev liblzma-dev liblz4-dev libzstd-dev lrzip cmake
        fi
 elif [ "$1" = "test" ]
 then
-       if [ "$UNAME" = "FreeBSD" ]
+       if [ "$UNAME" = "FreeBSD" -a "$BUILD_SYSTEM" != "cmake" ]
        then
                set -e
                echo "Additional NFSv4 ACL tests"

diff --git a/build/ci_build.sh b/build/ci_build.sh
index 5651c02d18a5c7cbab62398037ca431f1386b75f..c184a6f168d9130e938d2785ba144e179e02adce 100755 (executable)
--- a/build/ci_build.sh
+++ b/build/ci_build.sh
@@ -99,7 +99,7 @@ for action in ${ACTIONS}; do
                                        ;;
                        esac
                        RET="$?"
-                       find /tmp -path '*_test.*' -name '*.log' -print -exec cat {} \;
+                       find ${TMPDIR:-/tmp} -path '*_test.*' -name '*.log' -print -exec cat {} \;
                ;;
        esac
        if [ "${RET}" != "0" ]; then