diff options
author | Martin Matuska <martin@matuska.org> | 2020-02-24 23:30:20 +0100 |
---|---|---|
committer | Martin Matuska <martin@matuska.org> | 2020-02-25 02:53:24 +0100 |
commit | 25fc8895060e8cfc602a65edb8e5a2e84611f3a7 (patch) | |
tree | 8aa544f0121e47be1090b69c1c7c3d3a0a4e1746 /build/ci | |
parent | ec5b86b48e99c5501374b01606f1ccdae6a8a93e (diff) | |
download | libarchive-25fc8895060e8cfc602a65edb8e5a2e84611f3a7.tar.gz |
CI: various adjustments
Always bootstrap pkg on FreeBSD
Remove unnecessary dependency on libzip-dev
Remove Cirrus CI Fedora builds for now
Diffstat (limited to 'build/ci')
-rw-r--r-- | build/ci/cirrus_ci/Dockerfile.fc30 | 3 | ||||
-rw-r--r-- | build/ci/cirrus_ci/Dockerfile.fc31 (renamed from build/ci/cirrus_ci/Dockerfile.fc30.distcheck) | 4 | ||||
-rw-r--r-- | build/ci/cirrus_ci/Dockerfile.fc31.distcheck | 3 | ||||
-rwxr-xr-x | build/ci/cirrus_ci/ci.sh | 6 |
4 files changed, 9 insertions, 7 deletions
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.fc31 index 0129ec44..435f1d20 100644 --- a/build/ci/cirrus_ci/Dockerfile.fc30.distcheck +++ b/build/ci/cirrus_ci/Dockerfile.fc31 @@ -1,3 +1,3 @@ -FROM fedora:30 +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 libzip-devel zlib-devel xz-devel lz4-devel libzstd-devel openssl-devel groff ghostscript xz zip +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" ] |