.gitlab-ci.yml | 21 +++++++++++++++++++--
.gitlab-ci/ci.template | 17 +++++++++++++++++
.gitlab-ci/config.yml | 2 +-
doc/fontconfig-devel.sgml | 2 +-
4 files changed, 38 insertions(+), 4 deletions(-)
New commits:
commit 9b219e2af8e9f1e9eb671cc87c9c49a490b3b235
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Thu Jan 11 19:35:02 2024 +0900
doc: default index for fontconfig-devel to index.html
diff --git a/doc/fontconfig-devel.sgml b/doc/fontconfig-devel.sgml
index d0ff66b..a3d41fb 100644
--- a/doc/fontconfig-devel.sgml
+++ b/doc/fontconfig-devel.sgml
@@ -46,7 +46,7 @@
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
-->
-<article>
+<article id="index">
<title>Fontconfig Developers Reference, Version &version; </title>
<artheader>
<author>
commit ccb837cb2f1c2a8b18afc5c3f34d025bab1677a9
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Thu Jan 11 18:17:57 2024 +0900
Publish docs to GitLab pages
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c6434f3..6d5918e 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: '2023-12-05.1-7c59f403cca5'
- FREEBSD_TAG: '2023-12-05.1-b3f6fd9ee634'
+ FEDORA_TAG: '2024-01-11.1-21391676125f'
+ FREEBSD_TAG: '2024-01-11.1-6ddd7d2cf9ad'
FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh'
FREEBSD_EXEC: 'bash .gitlab-ci/freebsd-install.sh'
@@ -326,6 +326,8 @@ freebsd:13.2@container-clean:
when: always
expire_in: 5 days
paths:
+ - build*/doc/fontconfig-user.html
+ - build*/doc/fontconfig-devel/*
- build*/fc-build.log
- build*/fontconfig-*.tar.*
- build*/test/*log
@@ -715,3 +717,18 @@ check-merge-request:
junit: results.xml
allow_failure: true
+pages:
+ stage: deploy
+ script:
+ - |
+ mkdir public || :
+ cp -a build*/doc/fontconfig-user.html build*/doc/fontconfig-devel public/
+ artifacts:
+ paths:
+ - public
+ dependencies:
+ - t_fedora:rawhide:autotools shared libxml2
+ needs:
+ - t_fedora:rawhide:autotools shared libxml2
+ rules:
+ - if: $CI_COMMIT_BRANCH == "main" && $CI_PIPELINE_SOURCE != "merge_request_event"
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 3a1f662..0b48553 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -267,6 +267,8 @@ check-ci-script:
when: always
expire_in: 5 days
paths:
+ - build*/doc/fontconfig-user.html
+ - build*/doc/fontconfig-devel/*
- build*/fc-build.log
- build*/fontconfig-*.tar.*
- build*/test/*log
@@ -329,3 +331,18 @@ check-merge-request:
junit: results.xml
allow_failure: true
+pages:
+ stage: deploy
+ script:
+ - |
+ mkdir public || :
+ cp -a build*/doc/fontconfig-user.html build*/doc/fontconfig-devel public/
+ artifacts:
+ paths:
+ - public
+ dependencies:
+ - t_fedora:rawhide:autotools shared libxml2
+ needs:
+ - t_fedora:rawhide:autotools shared libxml2
+ rules:
+ - if: $CI_COMMIT_BRANCH == "main" && $CI_PIPELINE_SOURCE != "merge_request_event"
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index d3547f0..60d72e0 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -1,4 +1,4 @@
-.default_tag: &default_tag "2023-12-05.1"
+.default_tag: &default_tag "2024-01-11.1"
distributions:
- name: fedora
