summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml15
1 files changed, 13 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ec9ea9b..694d842 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-04.1'
- FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake make flex bison xorg-util-macros xorgproto libx11 libxext libxt libxmu libice libsm libxrandr'
+ FDO_DISTRIBUTION_TAG: '2024-03-10.1'
+ FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf meson autoconf automake make flex bison xorg-util-macros xorgproto libx11 libxext libxt libxmu libice libsm libxrandr'
#
@@ -96,3 +96,14 @@ build:
- make check
- make distcheck
- popd > /dev/null
+
+#
+# Alternative build using meson.
+#
+build-meson:
+ stage: build
+ extends:
+ - .fdo.distribution-image@arch
+ script:
+ - meson setup build
+ - meson compile -C build