From 25fc8895060e8cfc602a65edb8e5a2e84611f3a7 Mon Sep 17 00:00:00 2001 From: Martin Matuska Date: Mon, 24 Feb 2020 23:30:20 +0100 Subject: CI: various adjustments Always bootstrap pkg on FreeBSD Remove unnecessary dependency on libzip-dev Remove Cirrus CI Fedora builds for now --- build/ci/cirrus_ci/Dockerfile.fc30 | 3 --- build/ci/cirrus_ci/Dockerfile.fc30.distcheck | 3 --- build/ci/cirrus_ci/Dockerfile.fc31 | 3 +++ build/ci/cirrus_ci/Dockerfile.fc31.distcheck | 3 +++ build/ci/cirrus_ci/ci.sh | 6 ++++-- build/release/Dockerfile | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) delete mode 100644 build/ci/cirrus_ci/Dockerfile.fc30 delete mode 100644 build/ci/cirrus_ci/Dockerfile.fc30.distcheck create mode 100644 build/ci/cirrus_ci/Dockerfile.fc31 create mode 100644 build/ci/cirrus_ci/Dockerfile.fc31.distcheck (limited to 'build') diff --git a/build/ci/cirrus_ci/Dockerfile.fc30 b/build/ci/cirrus_ci/Dockerfile.fc30 deleted file mode 100644 index 72a88bcc..00000000 --- a/build/ci/cirrus_ci/Dockerfile.fc30 +++ /dev/null @@ -1,3 +0,0 @@ -FROM fedora:30 - -RUN dnf -y install make cmake gcc gcc-c++ kernel-devel automake libtool bison sharutils pkgconf libacl-devel libasan librichacl-devel bzip2-devel libzip-devel zlib-devel xz-devel lz4-devel libzstd-devel openssl-devel nettle-devel mbedtls-devel diff --git a/build/ci/cirrus_ci/Dockerfile.fc30.distcheck b/build/ci/cirrus_ci/Dockerfile.fc30.distcheck deleted file mode 100644 index 0129ec44..00000000 --- a/build/ci/cirrus_ci/Dockerfile.fc30.distcheck +++ /dev/null @@ -1,3 +0,0 @@ -FROM fedora:30 - -RUN dnf -y install make cmake gcc gcc-c++ kernel-devel automake libtool bison sharutils pkgconf libacl-devel libasan librichacl-devel bzip2-devel libzip-devel zlib-devel xz-devel lz4-devel libzstd-devel openssl-devel groff ghostscript xz zip diff --git a/build/ci/cirrus_ci/Dockerfile.fc31 b/build/ci/cirrus_ci/Dockerfile.fc31 new file mode 100644 index 00000000..435f1d20 --- /dev/null +++ b/build/ci/cirrus_ci/Dockerfile.fc31 @@ -0,0 +1,3 @@ +FROM fedora:31 + +RUN dnf -y install make cmake gcc gcc-c++ kernel-devel automake libtool bison sharutils pkgconf libacl-devel libasan librichacl-devel bzip2-devel zlib-devel xz-devel lz4-devel libzstd-devel openssl-devel nettle-devel mbedtls-devel diff --git a/build/ci/cirrus_ci/Dockerfile.fc31.distcheck b/build/ci/cirrus_ci/Dockerfile.fc31.distcheck new file mode 100644 index 00000000..78b12899 --- /dev/null +++ b/build/ci/cirrus_ci/Dockerfile.fc31.distcheck @@ -0,0 +1,3 @@ +FROM fedora:31 + +RUN dnf -y install make cmake gcc gcc-c++ kernel-devel automake libtool bison sharutils pkgconf libacl-devel libasan librichacl-devel bzip2-devel zlib-devel xz-devel lz4-devel libzstd-devel openssl-devel groff ghostscript xz zip diff --git a/build/ci/cirrus_ci/ci.sh b/build/ci/cirrus_ci/ci.sh index c07ebfe9..27ef05c3 100755 --- a/build/ci/cirrus_ci/ci.sh +++ b/build/ci/cirrus_ci/ci.sh @@ -5,7 +5,9 @@ then if [ "${UNAME}" = "FreeBSD" ] then set -x -e + env ASSUME_ALWAYS_YES=yes pkg bootstrap -f sed -i.bak -e 's,pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly,pkg+http://pkg.FreeBSD.org/\${ABI}/latest,' /etc/pkg/FreeBSD.conf + pkg update mount -u -o acls / mkdir /tmp_acl_nfsv4 MD=`mdconfig -a -t swap -s 128M` @@ -27,10 +29,10 @@ then 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 + apt-get -y install build-essential locales automake libtool bison sharutils pkgconf libacl1-dev libbz2-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 + dnf -y install make cmake gcc gcc-c++ kernel-devel automake libtool bison sharutils pkgconf libacl-devel librichacl-devel bzip2-devel zlib-devel xz-devel lz4-devel libzstd-devel openssl-devel fi fi elif [ "$1" = "test" ] diff --git a/build/release/Dockerfile b/build/release/Dockerfile index 76944f40..fc920b6e 100644 --- a/build/release/Dockerfile +++ b/build/release/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:18.04 -RUN apt-get update && apt-get install -y build-essential autoconf automake libtool pkg-config cmake libssl-dev libacl1-dev libbz2-dev liblzma-dev libzip-dev liblz4-dev libzstd-dev lzop groff ghostscript bsdmainutils zip +RUN apt-get update && apt-get install -y build-essential autoconf automake libtool pkg-config cmake libssl-dev libacl1-dev libbz2-dev liblzma-dev liblz4-dev libzstd-dev lzop groff ghostscript bsdmainutils zip ADD . $HOME/libarchive/ ADD "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" $HOME/libarchive/build/autoconf/config.guess ADD "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" $HOME/libarchive/build/autoconf/config.sub -- cgit v1.2.1