test: drop brew curl to use the system one

This commit is contained in:
Daniele Varrazzo 2025-01-05 20:20:06 +01:00
parent d0bc154f31
commit b943457896

View File

@ -52,13 +52,11 @@ case "$ID" in
centos) centos)
yum update -y yum update -y
yum install -y zlib-devel krb5-devel pam-devel yum install -y zlib-devel krb5-devel pam-devel
curl="$(which curl)"
;; ;;
alpine) alpine)
apk upgrade apk upgrade
apk add --no-cache zlib-dev krb5-dev linux-pam-dev openldap-dev openssl-dev apk add --no-cache zlib-dev krb5-dev linux-pam-dev openldap-dev openssl-dev
curl="$(which curl)"
;; ;;
macos) macos)
@ -66,8 +64,7 @@ case "$ID" in
# If available, libpq seemingly insists on linking against homebrew's # If available, libpq seemingly insists on linking against homebrew's
# openssl no matter what so remove it. Since homebrew's curl depends on # openssl no matter what so remove it. Since homebrew's curl depends on
# it, force use of system curl. # it, force use of system curl.
brew uninstall --force --ignore-dependencies openssl gettext brew uninstall --force --ignore-dependencies openssl gettext curl
curl="/usr/bin/curl"
if [ -z "$MACOSX_ARCHITECTURE" ]; then if [ -z "$MACOSX_ARCHITECTURE" ]; then
MACOSX_ARCHITECTURE="$(uname -m)" MACOSX_ARCHITECTURE="$(uname -m)"
fi fi
@ -107,7 +104,8 @@ if [ "$ID" == "centos" ] || [ "$ID" == "macos" ]; then
# Build openssl if needed # Build openssl if needed
openssl_tag="OpenSSL_${openssl_version//./_}" openssl_tag="OpenSSL_${openssl_version//./_}"
openssl_dir="openssl-${openssl_tag}" openssl_dir="openssl-${openssl_tag}"
if [ ! -d "${openssl_dir}" ]; then "$curl" -sL \ if [ ! -d "${openssl_dir}" ]; then
curl -sL \
https://github.com/openssl/openssl/archive/${openssl_tag}.tar.gz \ https://github.com/openssl/openssl/archive/${openssl_tag}.tar.gz \
| tar xzf - | tar xzf -
@ -139,8 +137,7 @@ if [ "$ID" == "macos" ]; then
# Build kerberos if needed # Build kerberos if needed
krb5_dir="krb5-${krb5_version}/src" krb5_dir="krb5-${krb5_version}/src"
if [ ! -d "${krb5_dir}" ]; then if [ ! -d "${krb5_dir}" ]; then
"$curl" -sL \ curl -sL "https://kerberos.org/dist/krb5/${krb5_version%.*}/krb5-${krb5_version}.tar.gz" \
curl -sL "https://kerberos.org/dist/krb5/$(echo 1.21.3 | grep -oE '\d+\.\d+')/krb5-${krb5_version}.tar.gz" \
| tar xzf - | tar xzf -
cd "${krb5_dir}" cd "${krb5_dir}"
@ -161,8 +158,7 @@ if [ "$ID" == "macos" ]; then
# Build gettext if needed # Build gettext if needed
gettext_dir="gettext-${gettext_version}" gettext_dir="gettext-${gettext_version}"
if [ ! -d "${gettext_dir}" ]; then if [ ! -d "${gettext_dir}" ]; then
"$curl" -sL \ curl -sL "https://ftp.gnu.org/pub/gnu/gettext/gettext-${gettext_version}.tar.gz" \
curl -sL "https://ftp.gnu.org/pub/gnu/gettext/gettext-${gettext_version}.tar.gz" \
| tar xzf - | tar xzf -
cd "${gettext_dir}" cd "${gettext_dir}"
@ -187,7 +183,7 @@ if [ "$ID" == "centos" ] || [ "$ID" == "macos" ]; then
sasl_tag="cyrus-sasl-${sasl_version}" sasl_tag="cyrus-sasl-${sasl_version}"
sasl_dir="cyrus-sasl-${sasl_tag}" sasl_dir="cyrus-sasl-${sasl_tag}"
if [ ! -d "${sasl_dir}" ]; then if [ ! -d "${sasl_dir}" ]; then
"$curl" -sL \ curl -sL \
https://github.com/cyrusimap/cyrus-sasl/archive/${sasl_tag}.tar.gz \ https://github.com/cyrusimap/cyrus-sasl/archive/${sasl_tag}.tar.gz \
| tar xzf - | tar xzf -
@ -215,7 +211,7 @@ if [ "$ID" == "centos" ] || [ "$ID" == "macos" ]; then
ldap_tag="${ldap_version}" ldap_tag="${ldap_version}"
ldap_dir="openldap-${ldap_tag}" ldap_dir="openldap-${ldap_tag}"
if [ ! -d "${ldap_dir}" ]; then if [ ! -d "${ldap_dir}" ]; then
"$curl" -sL \ curl -sL \
https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${ldap_tag}.tgz \ https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-${ldap_tag}.tgz \
| tar xzf - | tar xzf -
@ -245,7 +241,7 @@ fi
postgres_tag="REL_${postgres_version//./_}" postgres_tag="REL_${postgres_version//./_}"
postgres_dir="postgres-${postgres_tag}" postgres_dir="postgres-${postgres_tag}"
if [ ! -d "${postgres_dir}" ]; then if [ ! -d "${postgres_dir}" ]; then
"$curl" -sL \ curl -sL \
https://github.com/postgres/postgres/archive/${postgres_tag}.tar.gz \ https://github.com/postgres/postgres/archive/${postgres_tag}.tar.gz \
| tar xzf - | tar xzf -