.gitlab-ci.yml | 7 +++++--
.gitlab-ci/config.yml | 3 ++-
2 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 45b48f286e9d5c0f45c46ee887e8ac81f6efbff0
Merge: 6a87e15 2436df3
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Fri Jan 17 13:21:58 2025 +0000
Merge branch 'ci-enable-meson-dist' into 'main'
ci: Enable meson dist
See merge request fontconfig/fontconfig!357
commit 2436df3381f0c3ebf366d464d3e7c333eafd13bf
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Fri Jan 17 17:20:27 2025 +0900
ci: Enable meson dist
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 228fc6e..7bd5bc6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,8 +41,8 @@ variables:
# changing these will force rebuilding the associated image
# Note: these tags have no meaning and are not tied to a particular
# fontconfig version
- FEDORA_TAG: '2024-11-13.2-3bd7920ce40a'
- FREEBSD_TAG: '2024-11-13.2-f272a7918d7b'
+ FEDORA_TAG: '2025-01-17.1-ad5c9d5d2ff5'
+ FREEBSD_TAG: '2025-01-17.1-285a32ac747a'
FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh'
FREEBSD_EXEC: 'bash .gitlab-ci/freebsd-install.sh'
@@ -382,6 +382,7 @@ t_fedora:rawhide:meson shared libxml2:
FC_BUILDSYS: meson
FC_BUILD_TYPE: shared
FC_XML_BACKEND: libxml2
+ FC_BUILD_DISTCHECK: 1
needs:
- 'fedora:rawhide@container-prep'
@@ -549,6 +550,7 @@ t_fedora:41:meson shared libxml2:
FC_BUILDSYS: meson
FC_BUILD_TYPE: shared
FC_XML_BACKEND: libxml2
+ FC_BUILD_DISTCHECK: 1
needs:
- 'fedora:41@container-prep'
@@ -628,6 +630,7 @@ t_fedora:40:meson shared libxml2:
FC_BUILDSYS: meson
FC_BUILD_TYPE: shared
FC_XML_BACKEND: libxml2
+ FC_BUILD_DISTCHECK: 1
needs:
- 'fedora:40@container-prep'
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 426ea6a..a1d3152 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -1,4 +1,4 @@
-.default_tag: &default_tag "2024-11-13.2"
+.default_tag: &default_tag "2025-01-17.1"
distributions:
- name: fedora
@@ -31,6 +31,7 @@ distributions:
FC_BUILDSYS: meson
FC_BUILD_TYPE: shared
FC_XML_BACKEND: libxml2
+ FC_BUILD_DISTCHECK: 1
- name: "autotools static expat"
build_only: "rawhide"
variables:
