From dbb81dbe7e61f7f0a884fddee79b4a5b81a77d56 Mon Sep 17 00:00:00 2001
From: Michka Popoff <michkapopoff@gmail.com>
Date: Fri, 20 Nov 2020 18:06:55 +0100
Subject: [PATCH] brew: lower curl minimum version for debian 7 CI
We do not use curl that much there, setting the HOMEBREW_ON_DEBIAN7 flag
allows to lower the version, so that we can successfully pass the curl
version check below.
---
Library/Homebrew/brew.sh | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index d0b15e080f..941e24b16b 100644
--- a/Library/Homebrew/brew.sh
+++ b/Library/Homebrew/brew.sh
@@ -344,8 +344,14 @@ else
: "${HOMEBREW_OS_VERSION:=$(uname -r)}"
HOMEBREW_OS_USER_AGENT_VERSION="$HOMEBREW_OS_VERSION"
- # Ensure the system Curl is a version that supports modern HTTPS certificates.
- HOMEBREW_MINIMUM_CURL_VERSION="7.41.0"
+ if [[ -n $HOMEBREW_FORCE_HOMEBREW_ON_LINUX && -n $HOMEBREW_DEVELOPER && -n $HOMEBREW_ON_DEBIAN7 ]]
+ then
+ # Special version for our debian 7 docker container used to build patchelf and binutils
+ HOMEBREW_MINIMUM_CURL_VERSION="7.25.0"
+ else
+ # Ensure the system Curl is a version that supports modern HTTPS certificates.
+ HOMEBREW_MINIMUM_CURL_VERSION="7.41.0"
+ fi
curl_version_output="$($HOMEBREW_CURL --version 2>/dev/null)"
curl_name_and_version="${curl_version_output%% (*}"
if [[ $(numeric "${curl_name_and_version##* }") -lt $(numeric "$HOMEBREW_MINIMUM_CURL_VERSION") ]]
--
GitLab