From: Martin Matuska <martin@matuska.org>
Date: Sun, 20 Jan 2019 23:12:28 +0000 (+0100)
Subject: Cirrus CI: add Fedora 29 container test
X-Git-Tag: v3.4.0~133
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4891f608cbb749d819c30ab47dfd2bcde021e93c;p=thirdparty%2Flibarchive.git

Cirrus CI: add Fedora 29 container test
---

diff --git a/.cirrus.yml b/.cirrus.yml
index 15c3cba92..ea804e791 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -4,6 +4,8 @@ env:
 
 task:
   matrix:
+    container:
+      image: fedora:29
     freebsd_instance:
       image: freebsd-12-0-release-amd64
     freebsd_instance:
diff --git a/build/ci/cirrus_ci.sh b/build/ci/cirrus_ci.sh
index ae8a1a716..cb7d42c5b 100755
--- a/build/ci/cirrus_ci.sh
+++ b/build/ci/cirrus_ci.sh
@@ -19,10 +19,16 @@ then
 		set -x -e
 		brew update
 		brew install autoconf automake libtool pkg-config cmake xz lz4 zstd
-	elif [ "$UNAME" = "Linux" -a -f /etc/debian_version ]
+	elif [ "$UNAME" = "Linux" ]
 	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
+		if [ -f "/etc/debian_version" ]
+		then
+			apt-get -y update
+			apt-get -y install build-essential locales automake libtool bison sharutils pkgconf libacl1-dev libbz2-dev libzip-dev zlib1g-dev liblzma-dev liblz4-dev libzstd-dev libssl-dev lrzip cmake
+		elif [ -f "/etc/fedora-release" ]
+		then
+			dnf -y install make cmake gcc gcc-c++ kernel-devel automake libtool bison sharutils pkgconf libacl-devel librichacl-devel bzip2-devel libzip-devel zlib-devel xz-devel lz4-devel libzstd-devel openssl-devel
+		fi
 	fi
 elif [ "$1" = "test" ]
 then
@@ -31,7 +37,7 @@ then
 		set -e
 		echo "Additional NFSv4 ACL tests"
 		CURDIR=`pwd`
-		BUILDDIR="${CURDIR}/build_ci/autotools"
+		BUILDDIR="${CURDIR}/build_ci/${BUILD_SYSTEM}"
 		cd "${BUILDDIR}"
 		TMPDIR=/tmp_acl_nfsv4 ./libarchive_test -r "${CURDIR}/libarchive/test" -v test_acl_platform_nfs4
 	fi