From ff50baec65bba1a839322ba8bcb3efcd08f40621 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Wed, 30 Mar 2022 09:33:28 -0700 Subject: [PATCH] ci: enable zstd where available. Since zstd is now used in a bunch of places, enable it in CI. The windows image unfortunately doesn't yet contain zstd, so it's not enabled there. Discussion: https://postgr.es/m/20220330155017.lfnlzt3m42nk7kff@alap3.anarazel.de --- .cirrus.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 171bd29cf0..7b883b462a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -101,6 +101,7 @@ task: --with-ssl=openssl \ --with-tcl --with-tclconfig=/usr/local/lib/tcl8.6/ \ --with-uuid=bsd \ + --with-zstd \ \ --with-includes=/usr/local/include \ --with-libs=/usr/local/lib \ @@ -142,6 +143,7 @@ LINUX_CONFIGURE_FEATURES: &LINUX_CONFIGURE_FEATURES >- --with-systemd --with-tcl --with-tclconfig=/usr/lib/tcl8.6/ --with-uuid=ossp + --with-zstd task: @@ -270,7 +272,8 @@ task: openldap \ openssl \ python \ - tcl-tk + tcl-tk \ + zstd brew cleanup -s # to reduce cache size upload_caches: homebrew @@ -282,7 +285,7 @@ task: INCLUDES="${brewpath}/include:${INCLUDES}" LIBS="${brewpath}/lib:${LIBS}" - for pkg in icu4c krb5 openldap openssl ; do + for pkg in icu4c krb5 openldap openssl zstd ; do pkgpath="${brewpath}/opt/${pkg}" INCLUDES="${pkgpath}/include:${INCLUDES}" LIBS="${pkgpath}/lib:${LIBS}" @@ -307,6 +310,7 @@ task: --with-ssl=openssl \ --with-tcl --with-tclconfig=${brewpath}/opt/tcl-tk/lib/ \ --with-uuid=e2fs \ + --with-zstd \ \ --prefix=${HOME}/install \ --with-includes="${INCLUDES}" \