From: Magnus Jacobsson <Magnus.Jacobsson@berotec.se>
Date: Sun, 10 Oct 2021 10:05:20 +0000 (+0200)
Subject: CI: move generation of COLLECTION from macOS build template to individual jobs
X-Git-Tag: 2.49.2~10^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f0cb496214affdd9b255f2e8e4fab7f437db27ae;p=graphviz

CI: move generation of COLLECTION from macOS build template to individual jobs

This is no functional change, but makes the macOS build jobs more
similar to the Linux build jobs and opens up for letting the macOS
CMake and autotools builds use different COLLECTION in the future.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6ebf6c46b..d581b1bb2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -91,7 +91,6 @@ portable-source:
         - brew install pango || brew upgrade pango
         - brew install libxaw || brew upgrade libxaw
         - export PATH="/usr/local/opt/bison/bin:$PATH"
-        - echo experimental > COLLECTION
         - logfile=`mktemp`
         - ci/build.sh 2>&1 | tee $logfile
         - echo "$CI_JOB_NAME-warnings `grep -c 'warning:' $logfile`" > metrics.txt
@@ -443,6 +442,7 @@ macos-autotools-build:
     <<: *macos_build_definition
     before_script:
         - python3 gen_version.py > GRAPHVIZ_VERSION # FIXME: remove when building from portable source
+        - echo experimental > COLLECTION
         - export build_system="autotools"
     tags:
         - shared-macos-amd64
@@ -657,6 +657,7 @@ centos7-cmake-build:
 macos-cmake-build:
     <<: *macos_build_definition
     before_script:
+        - echo experimental > COLLECTION
         - export build_system="cmake"
         # fail on any compiler warnings
         - export CFLAGS=-Werror