]> granicus.if.org Git - graphviz/commitdiff
CI: move generation of COLLECTION from macOS build template to individual jobs
authorMagnus Jacobsson <Magnus.Jacobsson@berotec.se>
Sun, 10 Oct 2021 10:05:20 +0000 (12:05 +0200)
committerMagnus Jacobsson <Magnus.Jacobsson@berotec.se>
Tue, 12 Oct 2021 06:13:59 +0000 (08:13 +0200)
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.

.gitlab-ci.yml

index 6ebf6c46b88759e8543295f07f8901b717c0beb1..d581b1bb290e3de1832132a9ce1aaa618853fbb1 100644 (file)
@@ -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