From 007de871a84bbbbb47d6758b1a3cfa3d0fc1451d Mon Sep 17 00:00:00 2001 From: Bryan Richter <bryan@haskell.foundation> Date: Mon, 18 Sep 2023 10:18:40 +0300 Subject: [PATCH] gitlab-ci/brew.sh/curl: use LCD feature set Use the lowest common denominator features available on supported platforms. (cherry picked from commit 3a2ac9b298843124778117f91311ab9e2d48f832) # Conflicts: # .gitlab/brew.sh --- .gitlab/brew.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab/brew.sh b/.gitlab/brew.sh index a7bc602412..301c70f102 100644 --- a/.gitlab/brew.sh +++ b/.gitlab/brew.sh @@ -9,7 +9,11 @@ brew_dir="${CI_PROJECT_DIR}/.brew" if [ ! -e "${brew_dir}" ]; then mkdir -p "${brew_dir}" +<<<<<<< HEAD curl -L "https://github.com/Homebrew/brew/archive/refs/tags/${BREW_VERSION}.tar.gz" | tar xz --strip 1 -C "${brew_dir}" +======= + curl --fail -L "https://github.com/Homebrew/brew/archive/refs/tags/${BREW_VERSION}.tar.gz" | tar xz --strip 1 -C "${brew_dir}" +>>>>>>> 3a2ac9b29 (gitlab-ci/brew.sh/curl: use LCD feature set) fi export PATH="${brew_dir}/bin:${brew_dir}/sbin:$PATH" -- GitLab