fontconfig: Branch 'main' - 2 commits

[GitLab Mirror]

 .gitlab-ci.yml        |   36 ++++++++++++++++++------------------
 .gitlab-ci/config.yml |    4 ++--
 2 files changed, 20 insertions(+), 20 deletions(-)

New commits:
commit b7a8338f1933a6ac933389000d5160e9c30ccedd
Merge: a1100ce 5891092
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Feb 4 07:31:42 2025 +0000

    Merge branch 'ci-update' into 'main'
    
    ci: get back MinGW build to rawhide
    
    See merge request fontconfig/fontconfig!356

commit 589109226115846af0fc87584b8a5044a5ec0377
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Feb 4 15:47:58 2025 +0900

    ci: get back MinGW build to rawhide

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7bd5bc6..213ac59 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:    '2025-01-17.1-ad5c9d5d2ff5'
-  FREEBSD_TAG:   '2025-01-17.1-285a32ac747a'
+  FEDORA_TAG:    '2025-02-04.1-a62101346846'
+  FREEBSD_TAG:   '2025-02-04.1-2bd25cb2409e'
 
   FEDORA_EXEC:   'bash .gitlab-ci/fedora-install.sh'
   FREEBSD_EXEC:  'bash .gitlab-ci/freebsd-install.sh'
@@ -451,6 +451,22 @@ t_fedora:rawhide:meson static libxml2:
     - 'fedora:rawhide at container-prep'
 
 
+t_fedora:rawhide:mingw autotools static libxml2:
+  extends:
+    - .build at template
+    - .fdo.distribution-image at fedora
+    - .fc_artifacts
+  variables:
+    FC_DISTRO_NAME: fedora
+    FDO_DISTRIBUTION_VERSION: 'rawhide'
+    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
+    FC_BUILDSYS: autotools
+    FC_BUILD_TYPE: static
+    FC_XML_BACKEND: libxml2
+    FC_BUILD_PLATFORM: mingw
+    FC_BUILD_ARCH: x86_64-mingw32
+  needs:
+    - 'fedora:rawhide at container-prep'
 
 
 t_fedora:rawhide:mingw meson static expat:
@@ -643,22 +659,6 @@ t_fedora:40:meson shared libxml2:
 
 
 
-t_fedora:40:mingw autotools static libxml2:
-  extends:
-    - .build at template
-    - .fdo.distribution-image at fedora
-    - .fc_artifacts
-  variables:
-    FC_DISTRO_NAME: fedora
-    FDO_DISTRIBUTION_VERSION: '40'
-    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-    FC_BUILDSYS: autotools
-    FC_BUILD_TYPE: static
-    FC_XML_BACKEND: libxml2
-    FC_BUILD_PLATFORM: mingw
-    FC_BUILD_ARCH: x86_64-mingw32
-  needs:
-    - 'fedora:40 at container-prep'
 
 
 
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index a1d3152..893cf5a 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -1,4 +1,4 @@
-.default_tag: &default_tag "2025-01-17.1"
+.default_tag: &default_tag "2025-02-04.1"
 
 distributions:
   - name: fedora
@@ -57,7 +57,7 @@ distributions:
           FC_BUILD_TYPE: static
           FC_XML_BACKEND: libxml2
       - name: "mingw autotools static libxml2"
-        build_only: "40"
+        build_only: "rawhide"
         variables:
           FC_BUILDSYS: autotools
           FC_BUILD_TYPE: static