.gitlab-ci.yml | 6 +++---
.gitlab-ci/ci.template | 2 +-
.gitlab-ci/config.yml | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit ef4c5c09df69d9197357e0981ab36d8e94a68d20
Merge: 4b30215 d9e87d5
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Wed Nov 13 04:18:30 2024 +0000
Merge branch 'fix-pages-deployment' into 'main'
WIP: ci: Fix pages deployment again
See merge request fontconfig/fontconfig!344
commit d9e87d5718f27d804e3d36385b404c9fb9c0398c
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Wed Nov 13 11:51:55 2024 +0900
ci: Fix pages deployment again
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1c13863..571e863 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.1-08f953db8aa7'
- FREEBSD_TAG: '2024-11-13.1-ed8d8ffae892'
+ FEDORA_TAG: '2024-11-13.2-c29fad965005'
+ FREEBSD_TAG: '2024-11-13.2-bfcb7e03a785'
FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh'
FREEBSD_EXEC: 'bash .gitlab-ci/freebsd-install.sh'
@@ -306,7 +306,7 @@ freebsd:14.1@container-clean:
expire_in: 5 days
paths:
- build*/doc/fontconfig-user.html
- - build*/doc/fontconfig-devel/*
+ - build*/doc/fontconfig-devel.html
- build*/fc-build.log
- build*/config.log
- build*/fontconfig-*.tar.*
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index f90f860..7bcc84b 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -268,7 +268,7 @@ check-ci-script:
expire_in: 5 days
paths:
- build*/doc/fontconfig-user.html
- - build*/doc/fontconfig-devel/*
+ - build*/doc/fontconfig-devel.html
- build*/fc-build.log
- build*/config.log
- build*/fontconfig-*.tar.*
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 4f74b37..76e2d5d 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -1,4 +1,4 @@
-.default_tag: &default_tag "2024-11-13.1"
+.default_tag: &default_tag "2024-11-13.2"
distributions:
- name: fedora
