aboutsummaryrefslogtreecommitdiffstats
path: root/build/ci/cirrus_ci
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2020-03-02 02:12:53 +0000
committerMartin Matuska <mm@FreeBSD.org>2020-03-02 02:12:53 +0000
commit65da968c5ce7595908a244f509658357bf4bc49d (patch)
treec979bd80e10d9a6fc4ca0ce88f137ee6370d6a76 /build/ci/cirrus_ci
parent8185c4ae244f9a52ad987b36e7d6300500054d00 (diff)
downloadsrc-65da968c5ce7595908a244f509658357bf4bc49d.tar.gz
src-65da968c5ce7595908a244f509658357bf4bc49d.zip
Update vendor/libarchive/dist to git 85b9f665b6a2d4397fdd38992152d011265e374b
Relevant vendor changes: Issue #1257: Add testcase for ZIPX files with LZMA_STREAM_END marker PR #1331: cpio.5: fix hard link description Issue #1335: archive_read.c: fix UBSan warning about undefined behavior Issue #1338: XAR reader: fix UBSan warning about undefined behavior Issue #1339: bsdcpio_test: fix datatype in from_hex() Issue #1341: Safe writes: delete temporary file if rename fails
Notes
Notes: svn path=/vendor/libarchive/dist/; revision=358511
Diffstat (limited to 'build/ci/cirrus_ci')
-rw-r--r--build/ci/cirrus_ci/Dockerfile.fc303
-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.distcheck3
-rwxr-xr-xbuild/ci/cirrus_ci/ci.sh6
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 72a88bcc12b0..000000000000
--- 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 0129ec44e92a..435f1d2063d6 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 000000000000..78b128990d2d
--- /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 c07ebfe97bea..27ef05c3c25b 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" ]