CI: various adjustments

Always bootstrap pkg on FreeBSD
Remove unnecessary dependency on libzip-dev
Remove Cirrus CI Fedora builds for now

diff --git a/.cirrus.yml b/.cirrus.yml
index bcc953582f0b863ed5257bf8ab34267683dcaad2..d139c51425808e7901fc2672fc7a64a22b78dab9 100644 (file)
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -26,27 +26,6 @@ FreeBSD_task:
   install_script:
   - ./build/ci/build.sh -a install
 
-Fedora_30_task:
-  container:
-    dockerfile: build/ci/cirrus_ci/Dockerfile.fc30
-  env:
-    matrix:
-      - BS: autotools
-      - BS: cmake
-    matrix:
-      - CRYPTO: mbedtls
-      - CRYPTO: nettle
-      - CRYPTO: openssl
-  configure_script:
-  - ./build/ci/build.sh -a autogen
-  - ./build/ci/build.sh -a configure
-  build_script:
-  - ./build/ci/build.sh -a build
-  test_script:
-  - ./build/ci/build.sh -a test
-  install_script:
-  - ./build/ci/build.sh -a install
-
 Windows_Cygwin_task:
   windows_container:
     image: cirrusci/windowsservercore:2019

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2ffa282479b5623543c300549fd78d0486055041..08299af372f2097fb38c20841ae97380fc2a0c5f 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,7 +51,7 @@ jobs:
     steps:
     - uses: actions/checkout@master
     - name: Install dependencies
-      run: sudo apt-get install -y build-essential cmake libssl-dev nettle-dev libmbedtls-dev libacl1-dev libbz2-dev liblzma-dev libzip-dev liblz4-dev libzstd-dev lzop
+      run: sudo apt-get install -y build-essential cmake libssl-dev nettle-dev libmbedtls-dev libacl1-dev libbz2-dev liblzma-dev liblz4-dev libzstd-dev lzop
     - name: Autogen
       run: ./build/ci/build.sh -a autogen
       env:
@@ -87,7 +87,7 @@ jobs:
     steps:
     - uses: actions/checkout@master
     - name: Install dependencies
-      run: sudo apt-get install -y build-essential cmake libssl-dev libacl1-dev libbz2-dev liblzma-dev libzip-dev liblz4-dev libzstd-dev lzop groff ghostscript
+      run: sudo apt-get install -y build-essential cmake libssl-dev libacl1-dev libbz2-dev liblzma-dev liblz4-dev libzstd-dev lzop groff ghostscript
     - name: Autogen
       run: ./build/ci/build.sh -a autogen
     - name: Configure

diff --git a/build/ci/cirrus_ci/Dockerfile.fc30 b/build/ci/cirrus_ci/Dockerfile.fc30
deleted file mode 100644 (file)
index 72a88bc..0000000
--- 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
similarity index 50%
rename from build/ci/cirrus_ci/Dockerfile.fc30.distcheck
rename to build/ci/cirrus_ci/Dockerfile.fc31
index 0129ec44e92ae8be21a97d56978d7fcc4636edff..435f1d2063d6dd5277808450876f19a9a0e64a65 100644 (file)
--- 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 (file)
index 0000000..78b1289
--- /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 c07ebfe97beaec62f57f37b69143f9fbc679116a..27ef05c3c25b2f87369b1b7f7d776480bce4a9ae 100755 (executable)
--- 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 76944f40c48431337a408b210b1fd15f57e36908..fc920b6ec8be4d618744d12c3deae0bb040b88ff 100644 (file)
--- 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