fontconfig: Branch 'main' - 4 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Jul 2 12:03:42 UTC 2025
.gitlab-ci.yml | 48 ++++++++++++++++++++++++------------------------
.gitlab-ci/ci.template | 2 +-
.gitlab-ci/config.yml | 6 +++---
3 files changed, 28 insertions(+), 28 deletions(-)
New commits:
commit 03d02f393e55d076f72777958b91db1708d70afe
Merge: 6d0a989 44cd48b
Author: Akira TAGOH <akira at tagoh.org>
Date: Wed Jul 2 12:03:39 2025 +0000
Merge branch 'ci-template-update' into 'main'
CI template update
See merge request fontconfig/fontconfig!449
commit 44cd48baa743b54f7f34a779002830159006aa29
Author: Akira TAGOH <akira at tagoh.org>
Date: Wed Jul 2 20:13:04 2025 +0900
ci: Update ci-tamplates
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3dfbe02..08bafee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@
# and run ci-fairy generate-template. For details, see
# https://freedesktop.pages.freedesktop.org/ci-templates/ci-fairy.html#templating-gitlab-ci-yml
-.templates_sha: &template_sha ef5e4669b7500834a17ffe9277e15fbb6d977fff
+.templates_sha: &template_sha 32afe5644697e503af18a736587c8619fa036a72
include:
# Fedora container builder template
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 83d4af4..6e722f5 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -12,7 +12,7 @@
# and run ci-fairy generate-template. For details, see
# https://freedesktop.pages.freedesktop.org/ci-templates/ci-fairy.html#templating-gitlab-ci-yml
-.templates_sha: &template_sha ef5e4669b7500834a17ffe9277e15fbb6d977fff
+.templates_sha: &template_sha 32afe5644697e503af18a736587c8619fa036a72
include:
{% for distro in distributions|sort(attribute="name")|unique(attribute="name") %}
commit 5a3ddebc225a9851e8544ef69dfc5b3f7ca19ca0
Author: Akira TAGOH <akira at tagoh.org>
Date: Wed Jul 2 20:06:08 2025 +0900
ci: Add FreeBSD 14.2 and drop 14.1
pkg bootstrap seems not working on 14.3 image. Using 14.2 so far.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f2eb0cb..3dfbe02 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,8 +43,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: '2025-07-02.1-fbde134e0fc2'
- FREEBSD_TAG: '2025-07-02.1-7ca268a6b04b'
+ FEDORA_TAG: '2025-07-02.1-64bf940db86f'
+ FREEBSD_TAG: '2025-07-02.1-0a70e3d5a7e2'
FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh'
FREEBSD_EXEC: 'bash .gitlab-ci/freebsd-install.sh'
@@ -122,14 +122,14 @@ fedora:41 at container-prep:
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
-freebsd:14.1 at container-prep:
+freebsd:14.2 at container-prep:
extends: .fdo.qemu-build at freebsd
tags:
- kvm
stage: prep
variables:
GIT_STRATEGY: none
- FDO_DISTRIBUTION_VERSION: '14.1'
+ FDO_DISTRIBUTION_VERSION: '14.2'
FDO_DISTRIBUTION_PACKAGES: 'gcc autoconf automake libtool gettext gperf expat libxml2 freetype2 json-c git ninja wget python3 py311-pip pkgconf gmake gettext-runtime'
FDO_DISTRIBUTION_TAG: $FREEBSD_TAG
FDO_DISTRIBUTION_EXEC: $FREEBSD_EXEC
@@ -194,13 +194,13 @@ fedora:41 at container-clean:
FDO_DISTRIBUTION_VERSION: '41'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-freebsd:14.1 at container-clean:
+freebsd:14.2 at container-clean:
extends:
- .container-clean
variables:
GIT_STRATEGY: none
CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/freebsd/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
- FDO_DISTRIBUTION_VERSION: '14.1'
+ FDO_DISTRIBUTION_VERSION: '14.2'
FDO_DISTRIBUTION_TAG: $FREEBSD_TAG
@@ -672,7 +672,7 @@ t_fedora:rawhide:android aarch64:
- 'fedora:rawhide at container-prep'
-t_freebsd:14.1:standard build:
+t_freebsd:14.2:standard build:
stage: distro
extends:
- .build-in-qemu at template
@@ -680,14 +680,14 @@ t_freebsd:14.1:standard build:
- .fc_artifacts
variables:
FC_DISTRO_NAME: freebsd
- FDO_DISTRIBUTION_VERSION: '14.1'
+ FDO_DISTRIBUTION_VERSION: '14.2'
FDO_DISTRIBUTION_TAG: $FREEBSD_TAG
FC_BUILDSYS: meson
FC_BUILD_TYPE: shared
FC_XML_BACKEND: libxml2
FC_BUILD_NO_CHECK: 1
needs:
- - 'freebsd:14.1 at container-prep'
+ - 'freebsd:14.2 at container-prep'
#######################################
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index be323fa..6cfacab 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -110,7 +110,7 @@ distributions:
base_type: freebsd
qemu_based: true
versions:
- - "14.1"
+ - "14.2"
builds:
- name: "standard build"
variables:
commit 8852d7210a57aea632355b38034db4dd7803f735
Author: Akira TAGOH <akira at tagoh.org>
Date: Wed Jul 2 19:57:11 2025 +0900
ci: Add Fedora 42 and drop 40
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eb33f76..f2eb0cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,8 +43,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: '2025-04-30.1-1e6ed32d8678'
- FREEBSD_TAG: '2025-04-30.1-b401dfb43b5f'
+ FEDORA_TAG: '2025-07-02.1-fbde134e0fc2'
+ FREEBSD_TAG: '2025-07-02.1-7ca268a6b04b'
FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh'
FREEBSD_EXEC: 'bash .gitlab-ci/freebsd-install.sh'
@@ -102,22 +102,22 @@ fedora:rawhide at container-prep:
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
-fedora:41 at container-prep:
+fedora:42 at container-prep:
extends: .fdo.container-build at fedora
stage: prep
variables:
GIT_STRATEGY: none
- FDO_DISTRIBUTION_VERSION: '41'
+ FDO_DISTRIBUTION_VERSION: '42'
FDO_DISTRIBUTION_PACKAGES: '@buildsys-build autoconf automake clang-devel clang-tools-extra curl libtool gettext gettext-devel gperf expat-devel libxml2-devel freetype-devel json-c-devel git git-clang-format docbook-utils docbook-utils-pdf bubblewrap ninja-build wget python3-pip mingw64-expat mingw64-gcc mingw64-gettext mingw64-freetype mingw64-libxml2 rust cargo bindgen-cli'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
-fedora:40 at container-prep:
+fedora:41 at container-prep:
extends: .fdo.container-build at fedora
stage: prep
variables:
GIT_STRATEGY: none
- FDO_DISTRIBUTION_VERSION: '40'
+ FDO_DISTRIBUTION_VERSION: '41'
FDO_DISTRIBUTION_PACKAGES: '@buildsys-build autoconf automake clang-devel clang-tools-extra curl libtool gettext gettext-devel gperf expat-devel libxml2-devel freetype-devel json-c-devel git git-clang-format docbook-utils docbook-utils-pdf bubblewrap ninja-build wget python3-pip mingw64-expat mingw64-gcc mingw64-gettext mingw64-freetype mingw64-libxml2 rust cargo bindgen-cli'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
@@ -176,22 +176,22 @@ fedora:rawhide at container-clean:
FDO_DISTRIBUTION_VERSION: 'rawhide'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-fedora:41 at container-clean:
+fedora:42 at container-clean:
extends:
- .container-clean
variables:
GIT_STRATEGY: none
CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
- FDO_DISTRIBUTION_VERSION: '41'
+ FDO_DISTRIBUTION_VERSION: '42'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-fedora:40 at container-clean:
+fedora:41 at container-clean:
extends:
- .container-clean
variables:
GIT_STRATEGY: none
CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
- FDO_DISTRIBUTION_VERSION: '40'
+ FDO_DISTRIBUTION_VERSION: '41'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
freebsd:14.1 at container-clean:
@@ -595,7 +595,7 @@ t_fedora:rawhide:standard build:
- 'fedora:rawhide at container-prep'
-t_fedora:41:standard build:
+t_fedora:42:standard build:
stage: distro
extends:
- .build at template
@@ -603,17 +603,17 @@ t_fedora:41:standard build:
- .fc_artifacts
variables:
FC_DISTRO_NAME: fedora
- FDO_DISTRIBUTION_VERSION: '41'
+ FDO_DISTRIBUTION_VERSION: '42'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FC_BUILDSYS: meson
FC_BUILD_TYPE: shared
FC_XML_BACKEND: libxml2
FC_BUILD_DISTCHECK: 1
needs:
- - 'fedora:41 at container-prep'
+ - 'fedora:42 at container-prep'
-t_fedora:40:standard build:
+t_fedora:41:standard build:
stage: distro
extends:
- .build at template
@@ -621,14 +621,14 @@ t_fedora:40:standard build:
- .fc_artifacts
variables:
FC_DISTRO_NAME: fedora
- FDO_DISTRIBUTION_VERSION: '40'
+ FDO_DISTRIBUTION_VERSION: '41'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FC_BUILDSYS: meson
FC_BUILD_TYPE: shared
FC_XML_BACKEND: libxml2
FC_BUILD_DISTCHECK: 1
needs:
- - 'fedora:40 at container-prep'
+ - 'fedora:41 at container-prep'
t_fedora:rawhide:MinGW:
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 08d7c27..be323fa 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -1,4 +1,4 @@
-.default_tag: &default_tag "2025-04-30.1"
+.default_tag: &default_tag "2025-07-02.1"
build_patterns:
- name: "autotools shared expat"
@@ -70,8 +70,8 @@ distributions:
qemu_based: false
versions:
- "rawhide"
+ - "42"
- "41"
- - "40"
builds:
- name: "standard build"
upload: "rawhide"
More information about the Fontconfig
mailing list