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
This commit is contained in:
Andres Freund 2022-03-30 09:33:28 -07:00
parent f453d684ec
commit ff50baec65
1 changed files with 6 additions and 2 deletions

View File

@ -101,6 +101,7 @@ task:
--with-ssl=openssl \ --with-ssl=openssl \
--with-tcl --with-tclconfig=/usr/local/lib/tcl8.6/ \ --with-tcl --with-tclconfig=/usr/local/lib/tcl8.6/ \
--with-uuid=bsd \ --with-uuid=bsd \
--with-zstd \
\ \
--with-includes=/usr/local/include \ --with-includes=/usr/local/include \
--with-libs=/usr/local/lib \ --with-libs=/usr/local/lib \
@ -142,6 +143,7 @@ LINUX_CONFIGURE_FEATURES: &LINUX_CONFIGURE_FEATURES >-
--with-systemd --with-systemd
--with-tcl --with-tclconfig=/usr/lib/tcl8.6/ --with-tcl --with-tclconfig=/usr/lib/tcl8.6/
--with-uuid=ossp --with-uuid=ossp
--with-zstd
task: task:
@ -270,7 +272,8 @@ task:
openldap \ openldap \
openssl \ openssl \
python \ python \
tcl-tk tcl-tk \
zstd
brew cleanup -s # to reduce cache size brew cleanup -s # to reduce cache size
upload_caches: homebrew upload_caches: homebrew
@ -282,7 +285,7 @@ task:
INCLUDES="${brewpath}/include:${INCLUDES}" INCLUDES="${brewpath}/include:${INCLUDES}"
LIBS="${brewpath}/lib:${LIBS}" 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}" pkgpath="${brewpath}/opt/${pkg}"
INCLUDES="${pkgpath}/include:${INCLUDES}" INCLUDES="${pkgpath}/include:${INCLUDES}"
LIBS="${pkgpath}/lib:${LIBS}" LIBS="${pkgpath}/lib:${LIBS}"
@ -307,6 +310,7 @@ task:
--with-ssl=openssl \ --with-ssl=openssl \
--with-tcl --with-tclconfig=${brewpath}/opt/tcl-tk/lib/ \ --with-tcl --with-tclconfig=${brewpath}/opt/tcl-tk/lib/ \
--with-uuid=e2fs \ --with-uuid=e2fs \
--with-zstd \
\ \
--prefix=${HOME}/install \ --prefix=${HOME}/install \
--with-includes="${INCLUDES}" \ --with-includes="${INCLUDES}" \