summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2022-10-13 16:52:31 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2022-10-13 17:03:55 -0700
commitfa59e95ca40aab93388f8b27b1c1a36acee8f4ec (patch)
tree446f7351fa17abeddefa753223a2b15802fb25b6
parentc4e6767272fd37b6464f67b4dde387895297eb63 (diff)
gitlab CI: build all 3 --with-rgb-db-type=(text|dbm|ndbm) options
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--.gitlab-ci.yml17
1 files changed, 13 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f04742a..0392ce9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,8 +30,8 @@ variables:
# The tag should be updated each time the list of packages is updated.
# Changing a tag forces the associated image to be rebuilt.
# Note: the tag has no meaning, we use a date format purely for readability
- FDO_DISTRIBUTION_TAG: '2021-12-03.1'
- FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake make xorg-util-macros xorgproto'
+ FDO_DISTRIBUTION_TAG: '2022-10-07.3'
+ FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake make xorg-util-macros xorgproto gdbm xorg-server-devel pixman libpciaccess'
#
@@ -83,7 +83,7 @@ container-prep:
#
# The default build, runs on the image built above.
#
-build:
+.default_build:
stage: build
extends:
- .fdo.distribution-image@arch
@@ -91,8 +91,17 @@ build:
- autoreconf -ivf
- mkdir _builddir
- pushd _builddir > /dev/null
- - ../configure --disable-silent-rules
+ - ../configure --disable-silent-rules --with-rgb-db-type=${DB_TYPE}
+ --with-rgb-db-library=gdbm_compat
- make
- make check
- make distcheck
- popd > /dev/null
+
+# Run default build with all the different db options
+build:
+ extends:
+ - .default_build
+ parallel:
+ matrix:
+ - DB_TYPE: ["text", "dbm", "ndbm"]