fontconfig: Branch 'main' - 2 commits

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Apr 22 13:41:58 UTC 2024 

 .gitlab-ci.yml         |   70 ++++++++++++++++++++++++-------------------------
 .gitlab-ci/ci.template |    2 -
 .gitlab-ci/config.yml  |    4 +-
 3 files changed, 38 insertions(+), 38 deletions(-)

New commits:
commit 91145a1f5c49c8f57952626b007fa4e42de41a94
Merge: bc40c58 e90ee33
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Apr 22 13:41:57 2024 +0000

    Merge branch 'update-ci-images' into 'main'
    
    ci: Add Fedora 40 and remove Fedora 38
    
    See merge request fontconfig/fontconfig!322

commit e90ee33ebb77c8281fb81bb84354680260e56593
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Apr 22 15:24:07 2024 +0900

    ci: Add Fedora 40 and remove Fedora 38

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ea74e42..aab89ac 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 d11c0dd4c1c9a69c14b4af9b50cdd12b89d24672
+.templates_sha: &template_sha 98b1218f146a1ec96d65e3ce0041f9a6ec5cb5e6
 
 include:
   # Fedora container builder template
@@ -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-04-08.1-ec786b3b9ef2'
-  FREEBSD_TAG:   '2024-04-08.1-b5edf8602f60'
+  FEDORA_TAG:    '2024-04-22.1-3f4457bbcc1d'
+  FREEBSD_TAG:   '2024-04-22.1-eae64220fd2b'
 
   FEDORA_EXEC:   'bash .gitlab-ci/fedora-install.sh'
   FREEBSD_EXEC:  'bash .gitlab-ci/freebsd-install.sh'
@@ -100,22 +100,22 @@ fedora:rawhide at container-prep:
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
     FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
 
-fedora:39 at container-prep:
+fedora:40 at container-prep:
   extends: .fdo.container-build at fedora
   stage: prep
   variables:
     GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '39'
+    FDO_DISTRIBUTION_VERSION: '40'
     FDO_DISTRIBUTION_PACKAGES: '@buildsys-build autoconf automake libtool gettext gettext-devel gperf expat-devel libxml2-devel freetype-devel json-c-devel git docbook-utils docbook-utils-pdf bubblewrap ninja-build wget python3-pip mingw64-expat mingw64-gcc mingw64-gettext mingw64-freetype mingw64-libxml2 wine'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
     FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
 
-fedora:38 at container-prep:
+fedora:39 at container-prep:
   extends: .fdo.container-build at fedora
   stage: prep
   variables:
     GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '38'
+    FDO_DISTRIBUTION_VERSION: '39'
     FDO_DISTRIBUTION_PACKAGES: '@buildsys-build autoconf automake libtool gettext gettext-devel gperf expat-devel libxml2-devel freetype-devel json-c-devel git docbook-utils docbook-utils-pdf bubblewrap ninja-build wget python3-pip mingw64-expat mingw64-gcc mingw64-gettext mingw64-freetype mingw64-libxml2 wine'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
     FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
@@ -186,22 +186,22 @@ fedora:rawhide at container-clean:
     FDO_DISTRIBUTION_VERSION: 'rawhide'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
 
-fedora:39 at container-clean:
+fedora:40 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: '39'
+    FDO_DISTRIBUTION_VERSION: '40'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
 
-fedora:38 at container-clean:
+fedora:39 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: '38'
+    FDO_DISTRIBUTION_VERSION: '39'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
 
 freebsd:14.0 at container-clean:
@@ -508,69 +508,69 @@ t_fedora:rawhide:mingw meson static expat:
     - 'fedora:rawhide at container-prep'
 
 
-t_fedora:39:autotools shared expat:
+t_fedora:40:autotools shared expat:
   extends:
     - .build at template
     - .fdo.distribution-image at fedora
     - .fc_artifacts
   variables:
     FC_DISTRO_NAME: fedora
-    FDO_DISTRIBUTION_VERSION: '39'
+    FDO_DISTRIBUTION_VERSION: '40'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
     FC_BUILDSYS: autotools
     FC_BUILD_TYPE: shared
     FC_XML_BACKEND: expat
   needs:
-    - 'fedora:39 at container-prep'
+    - 'fedora:40 at container-prep'
 
 
-t_fedora:39:autotools shared libxml2:
+t_fedora:40:autotools shared libxml2:
   extends:
     - .build at template
     - .fdo.distribution-image at fedora
     - .fc_artifacts
   variables:
     FC_DISTRO_NAME: fedora
-    FDO_DISTRIBUTION_VERSION: '39'
+    FDO_DISTRIBUTION_VERSION: '40'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
     FC_BUILDSYS: autotools
     FC_BUILD_TYPE: shared
     FC_XML_BACKEND: libxml2
     FC_BUILD_DISTCHECK: 1
   needs:
-    - 'fedora:39 at container-prep'
+    - 'fedora:40 at container-prep'
 
 
-t_fedora:39:meson shared expat:
+t_fedora:40:meson shared expat:
   extends:
     - .build at template
     - .fdo.distribution-image at fedora
     - .fc_artifacts
   variables:
     FC_DISTRO_NAME: fedora
-    FDO_DISTRIBUTION_VERSION: '39'
+    FDO_DISTRIBUTION_VERSION: '40'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
     FC_BUILDSYS: meson
     FC_BUILD_TYPE: shared
     FC_XML_BACKEND: expat
   needs:
-    - 'fedora:39 at container-prep'
+    - 'fedora:40 at container-prep'
 
 
-t_fedora:39:meson shared libxml2:
+t_fedora:40:meson shared libxml2:
   extends:
     - .build at template
     - .fdo.distribution-image at fedora
     - .fc_artifacts
   variables:
     FC_DISTRO_NAME: fedora
-    FDO_DISTRIBUTION_VERSION: '39'
+    FDO_DISTRIBUTION_VERSION: '40'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
     FC_BUILDSYS: meson
     FC_BUILD_TYPE: shared
     FC_XML_BACKEND: libxml2
   needs:
-    - 'fedora:39 at container-prep'
+    - 'fedora:40 at container-prep'
 
 
 
@@ -585,69 +585,69 @@ t_fedora:39:meson shared libxml2:
 
 
 
-t_fedora:38:autotools shared expat:
+t_fedora:39:autotools shared expat:
   extends:
     - .build at template
     - .fdo.distribution-image at fedora
     - .fc_artifacts
   variables:
     FC_DISTRO_NAME: fedora
-    FDO_DISTRIBUTION_VERSION: '38'
+    FDO_DISTRIBUTION_VERSION: '39'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
     FC_BUILDSYS: autotools
     FC_BUILD_TYPE: shared
     FC_XML_BACKEND: expat
   needs:
-    - 'fedora:38 at container-prep'
+    - 'fedora:39 at container-prep'
 
 
-t_fedora:38:autotools shared libxml2:
+t_fedora:39:autotools shared libxml2:
   extends:
     - .build at template
     - .fdo.distribution-image at fedora
     - .fc_artifacts
   variables:
     FC_DISTRO_NAME: fedora
-    FDO_DISTRIBUTION_VERSION: '38'
+    FDO_DISTRIBUTION_VERSION: '39'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
     FC_BUILDSYS: autotools
     FC_BUILD_TYPE: shared
     FC_XML_BACKEND: libxml2
     FC_BUILD_DISTCHECK: 1
   needs:
-    - 'fedora:38 at container-prep'
+    - 'fedora:39 at container-prep'
 
 
-t_fedora:38:meson shared expat:
+t_fedora:39:meson shared expat:
   extends:
     - .build at template
     - .fdo.distribution-image at fedora
     - .fc_artifacts
   variables:
     FC_DISTRO_NAME: fedora
-    FDO_DISTRIBUTION_VERSION: '38'
+    FDO_DISTRIBUTION_VERSION: '39'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
     FC_BUILDSYS: meson
     FC_BUILD_TYPE: shared
     FC_XML_BACKEND: expat
   needs:
-    - 'fedora:38 at container-prep'
+    - 'fedora:39 at container-prep'
 
 
-t_fedora:38:meson shared libxml2:
+t_fedora:39:meson shared libxml2:
   extends:
     - .build at template
     - .fdo.distribution-image at fedora
     - .fc_artifacts
   variables:
     FC_DISTRO_NAME: fedora
-    FDO_DISTRIBUTION_VERSION: '38'
+    FDO_DISTRIBUTION_VERSION: '39'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
     FC_BUILDSYS: meson
     FC_BUILD_TYPE: shared
     FC_XML_BACKEND: libxml2
   needs:
-    - 'fedora:38 at container-prep'
+    - 'fedora:39 at container-prep'
 
 
 
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 905cd9c..1ddfdbe 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 d11c0dd4c1c9a69c14b4af9b50cdd12b89d24672
+.templates_sha: &template_sha 98b1218f146a1ec96d65e3ce0041f9a6ec5cb5e6
 
 include:
   {% for distro in distributions|sort(attribute="name") %}
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 3ff2ffa..ca20c1c 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -1,4 +1,4 @@
-.default_tag: &default_tag "2024-04-08.1"
+.default_tag: &default_tag "2024-04-22.1"
 
 distributions:
   - name: fedora
@@ -7,8 +7,8 @@ distributions:
     qemu_based: false
     versions:
       - "rawhide"
+      - "40"
       - "39"
-      - "38"
     builds:
       - name: "autotools shared expat"
         variables:

More information about the Fontconfig mailing list