From: Magnus Jacobsson <Magnus.Jacobsson@berotec.se>
Date: Mon, 26 Oct 2020 09:49:21 +0000 (+0100)
Subject: Move common commands from macOS jobs to macos_build_definition
X-Git-Tag: 2.46.0~20^2^2~10^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5956c7bef58cb7587c35a1ae78296ad5b247c1a2;p=graphviz

Move common commands from macOS jobs to macos_build_definition
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6f477613c..81f2cbc2a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,6 +67,14 @@ portable-source:
 .build_template: &macos_build_definition
     stage: build
     script:
+        - brew update
+        - brew install autogen || brew upgrade autogen
+        - brew install cmake || brew upgrade cmake
+        - brew install bison || brew upgrade bison
+        - brew install pango || brew upgrade pango
+        - export PATH="/usr/local/opt/bison/bin:$PATH"
+        - python3 gen_version.py > VERSION # FIXME: remove when building from portable source
+        - echo experimental > COLLECTION
         - logfile=`mktemp`
         - ci/build.sh 2>&1 | tee $logfile
         - echo "$CI_JOB_NAME-warnings `grep -c 'warning:' $logfile`" > metrics.txt
@@ -251,14 +259,7 @@ ubuntu20-04-build:
 macos-autotools-build:
     <<: *macos_build_definition
     before_script:
-        - brew update
-        - brew install autogen || brew upgrade autogen
-        - brew install bison || brew upgrade bison
-        - brew install pango || brew upgrade pango
-        - export PATH="/usr/local/opt/bison/bin:$PATH"
         - export build_system="autotools"
-        - python3 gen_version.py > VERSION # FIXME: remove when building from portable source
-        - echo experimental > COLLECTION
     tags:
         - macos
 
@@ -292,14 +293,7 @@ fedora31-cmake-build:
 macos-cmake-build:
     <<: *macos_build_definition
     before_script:
-        - brew update
-        - brew install cmake || brew upgrade cmake
-        - brew install bison || brew upgrade bison
-        - brew install pango || brew upgrade pango
-        - export PATH="/usr/local/opt/bison/bin:$PATH"
         - export build_system="cmake"
-        - python3 gen_version.py > VERSION
-        - echo experimental > COLLECTION
     tags:
         - macos