fontconfig: Branch 'main' - 2 commits

[GitLab Mirror]

 .gitlab-ci.yml         |    6 +++---
 .gitlab-ci/ci.template |    2 +-
 .gitlab-ci/config.yml  |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 90993ff8f3632293f79548d2c895797c77858fff
Merge: f91873a 62131f8
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Nov 13 02:27:11 2024 +0000

    Merge branch 'fix-pages-deployment' into 'main'
    
    ci: Fix a fail on pages deployment
    
    See merge request fontconfig/fontconfig!343

commit 62131f81172948c1770070f71b42d8abe255754e
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Nov 13 10:57:47 2024 +0900

    ci: Fix a fail on pages deployment

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6353870..1c13863 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-05.1-142cd4455e97'
-  FREEBSD_TAG:   '2024-11-05.1-4a2d6eca68b8'
+  FEDORA_TAG:    '2024-11-13.1-08f953db8aa7'
+  FREEBSD_TAG:   '2024-11-13.1-ed8d8ffae892'
 
   FEDORA_EXEC:   'bash .gitlab-ci/fedora-install.sh'
   FREEBSD_EXEC:  'bash .gitlab-ci/freebsd-install.sh'
@@ -736,7 +736,7 @@ pages:
   script:
     - |
       mkdir public || :
-      cp -a build*/doc/fontconfig-user.html build*/doc/fontconfig-devel public/
+      cp -a build*/doc/fontconfig-user.html build*/doc/fontconfig-devel.html public/
   artifacts:
     paths:
       - public
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 2ce76cf..f90f860 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -339,7 +339,7 @@ pages:
   script:
     - |
       mkdir public || :
-      cp -a build*/doc/fontconfig-user.html build*/doc/fontconfig-devel public/
+      cp -a build*/doc/fontconfig-user.html build*/doc/fontconfig-devel.html public/
   artifacts:
     paths:
       - public
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index af4185d..4f74b37 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -1,4 +1,4 @@
-.default_tag: &default_tag "2024-11-05.1"
+.default_tag: &default_tag "2024-11-13.1"
 
 distributions:
   - name: fedora