From: Magnus Jacobsson <magnus.jacobsson@berotec.se>
Date: Wed, 7 Oct 2020 11:48:57 +0000 (+0200)
Subject: Fix brew install on macOS fail when upgrade is available
X-Git-Tag: 2.46.0~20^2^2~49^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4e75ece8b76a79437d7ab9b049644ca93f7339c5;p=graphviz

Fix brew install on macOS fail when upgrade is available

brew install fails when there is an upgrade available, so run brew
upgrade when this happens.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e16a74869..54dab4f63 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -273,8 +273,8 @@ ubuntu20-04-build:
 macos-autotools-build:
     <<: *macos_build_definition
     before_script:
-        - brew install autogen
-        - brew install bison
+        - brew install autogen || brew upgrade autogen
+        - brew install bison || brew upgrade bison
         - export PATH="/usr/local/opt/bison/bin:$PATH"
         - export build_system="autotools"
         - python3 gen_version.py > VERSION # FIXME: remove when building from portable source
@@ -294,8 +294,8 @@ ubuntu18-04-cmake-build:
 macos-cmake-build:
     <<: *macos_build_definition
     before_script:
-        - brew install cmake
-        - brew install bison
+        - brew install cmake || brew upgrade cmake
+        - brew install bison || brew upgrade bison
         - export PATH="/usr/local/opt/bison/bin:$PATH"
         - export build_system="cmake"
         - python3 gen_version.py > VERSION