.gitlab-ci.yml | 224 +++++++++++++++----------------------------------
.gitlab-ci/ci.template | 11 ++
.gitlab-ci/config.yml | 11 +-
3 files changed, 86 insertions(+), 160 deletions(-)
New commits:
commit c0c4308812b46975e4dbea546ff3d009a8dbb3fc
Merge: dfa671b 2219762
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Wed Nov 6 02:26:58 2024 +0000
Merge branch 'ci-update' into 'main'
CI update
See merge request fontconfig/fontconfig!337
commit 2219762cec68916ebae2a0645d39bfd60cbaac75
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Tue Nov 5 16:43:07 2024 +0900
ci: build mingw on f40 only
There seems some issue on f41. build on f40 only tentatively
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7b5f4a9..6353870 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-10-31.1-f8217c171a86'
- FREEBSD_TAG: '2024-10-31.1-68faa3935c22'
+ FEDORA_TAG: '2024-11-05.1-142cd4455e97'
+ FREEBSD_TAG: '2024-11-05.1-4a2d6eca68b8'
FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh'
FREEBSD_EXEC: 'bash .gitlab-ci/freebsd-install.sh'
@@ -450,22 +450,6 @@ t_fedora:rawhide:meson static libxml2:
- 'fedora:rawhide@container-prep'
-t_fedora:rawhide:mingw autotools static libxml2:
- extends:
- - .build@template
- - .fdo.distribution-image@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@container-prep'
t_fedora:rawhide:mingw meson static expat:
@@ -637,6 +621,22 @@ t_fedora:40:meson shared libxml2:
+t_fedora:40:mingw autotools static libxml2:
+ extends:
+ - .build@template
+ - .fdo.distribution-image@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@container-prep'
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 7fda9ed..af4185d 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -1,4 +1,4 @@
-.default_tag: &default_tag "2024-10-31.1"
+.default_tag: &default_tag "2024-11-05.1"
distributions:
- name: fedora
@@ -56,7 +56,7 @@ distributions:
FC_BUILD_TYPE: static
FC_XML_BACKEND: libxml2
- name: "mingw autotools static libxml2"
- build_only: "rawhide"
+ build_only: "40"
variables:
FC_BUILDSYS: autotools
FC_BUILD_TYPE: static
commit 7424739db3dfa2506fde1aed3e0a2311318274e8
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Wed Oct 30 12:29:27 2024 +0900
ci: Add FreeBSD 14.1 and drop 13.2
Update images for supported releases.
However, 13.4 seems not working properly.
So dropped tentatively.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 45f298c..7b5f4a9 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-10-29.1-41214b06dc2e'
- FREEBSD_TAG: '2024-10-29.1-07eda677a3b7'
+ FEDORA_TAG: '2024-10-31.1-f8217c171a86'
+ FREEBSD_TAG: '2024-10-31.1-68faa3935c22'
FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh'
FREEBSD_EXEC: 'bash .gitlab-ci/freebsd-install.sh'
@@ -120,27 +120,15 @@ fedora:40@container-prep:
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
-freebsd:14.0@container-prep:
+freebsd:14.1@container-prep:
extends: .fdo.qemu-build@freebsd
tags:
- kvm
stage: prep
variables:
GIT_STRATEGY: none
- FDO_DISTRIBUTION_VERSION: '14.0'
- FDO_DISTRIBUTION_PACKAGES: 'gcc autoconf automake libtool gettext gperf expat libxml2 freetype2 json-c git ninja wget python3 py39-pip pkgconf gmake gettext-runtime'
- FDO_DISTRIBUTION_TAG: $FREEBSD_TAG
- FDO_DISTRIBUTION_EXEC: $FREEBSD_EXEC
-
-freebsd:13.2@container-prep:
- extends: .fdo.qemu-build@freebsd
- tags:
- - kvm
- stage: prep
- variables:
- GIT_STRATEGY: none
- FDO_DISTRIBUTION_VERSION: '13.2'
- FDO_DISTRIBUTION_PACKAGES: 'gcc autoconf automake libtool gettext gperf expat libxml2 freetype2 json-c git ninja wget python3 py39-pip pkgconf gmake gettext-runtime'
+ FDO_DISTRIBUTION_VERSION: '14.1'
+ FDO_DISTRIBUTION_PACKAGES: 'gcc autoconf automake libtool gettext gperf expat libxml2 freetype2 json-c git ninja wget python3 py311-pip pkgconf gmake gettext-runtime'
FDO_DISTRIBUTION_TAG: $FREEBSD_TAG
FDO_DISTRIBUTION_EXEC: $FREEBSD_EXEC
@@ -204,22 +192,13 @@ fedora:40@container-clean:
FDO_DISTRIBUTION_VERSION: '40'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-freebsd:14.0@container-clean:
+freebsd:14.1@container-clean:
extends:
- .container-clean
variables:
GIT_STRATEGY: none
CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/freebsd/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
- FDO_DISTRIBUTION_VERSION: '14.0'
- FDO_DISTRIBUTION_TAG: $FREEBSD_TAG
-
-freebsd:13.2@container-clean:
- extends:
- - .container-clean
- variables:
- GIT_STRATEGY: none
- CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/freebsd/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
- FDO_DISTRIBUTION_VERSION: '13.2'
+ FDO_DISTRIBUTION_VERSION: '14.1'
FDO_DISTRIBUTION_TAG: $FREEBSD_TAG
@@ -662,84 +641,14 @@ t_fedora:40:meson shared libxml2:
-t_freebsd:14.0:autotools shared expat:
- extends:
- - .build-in-qemu@template
- - .fdo.distribution-image@freebsd
- - .fc_artifacts
- variables:
- FC_DISTRO_NAME: freebsd
- FDO_DISTRIBUTION_VERSION: '14.0'
- FDO_DISTRIBUTION_TAG: $FREEBSD_TAG
- FC_BUILDSYS: autotools
- FC_BUILD_TYPE: shared
- FC_XML_BACKEND: expat
- MAKE: gmake
- FC_BUILD_NO_CHECK: 1
- needs:
- - 'freebsd:14.0@container-prep'
-
-
-t_freebsd:14.0:autotools shared libxml2:
- extends:
- - .build-in-qemu@template
- - .fdo.distribution-image@freebsd
- - .fc_artifacts
- variables:
- FC_DISTRO_NAME: freebsd
- FDO_DISTRIBUTION_VERSION: '14.0'
- FDO_DISTRIBUTION_TAG: $FREEBSD_TAG
- FC_BUILDSYS: autotools
- FC_BUILD_TYPE: shared
- FC_XML_BACKEND: libxml2
- MAKE: gmake
- FC_BUILD_NO_CHECK: 1
- needs:
- - 'freebsd:14.0@container-prep'
-
-
-t_freebsd:14.0:meson shared expat:
- extends:
- - .build-in-qemu@template
- - .fdo.distribution-image@freebsd
- - .fc_artifacts
- variables:
- FC_DISTRO_NAME: freebsd
- FDO_DISTRIBUTION_VERSION: '14.0'
- FDO_DISTRIBUTION_TAG: $FREEBSD_TAG
- FC_BUILDSYS: meson
- FC_BUILD_TYPE: shared
- FC_XML_BACKEND: expat
- FC_BUILD_NO_CHECK: 1
- needs:
- - 'freebsd:14.0@container-prep'
-
-
-t_freebsd:14.0:meson shared libxml2:
- extends:
- - .build-in-qemu@template
- - .fdo.distribution-image@freebsd
- - .fc_artifacts
- variables:
- FC_DISTRO_NAME: freebsd
- FDO_DISTRIBUTION_VERSION: '14.0'
- FDO_DISTRIBUTION_TAG: $FREEBSD_TAG
- FC_BUILDSYS: meson
- FC_BUILD_TYPE: shared
- FC_XML_BACKEND: libxml2
- FC_BUILD_NO_CHECK: 1
- needs:
- - 'freebsd:14.0@container-prep'
-
-
-t_freebsd:13.2:autotools shared expat:
+t_freebsd:14.1:autotools shared expat:
extends:
- .build-in-qemu@template
- .fdo.distribution-image@freebsd
- .fc_artifacts
variables:
FC_DISTRO_NAME: freebsd
- FDO_DISTRIBUTION_VERSION: '13.2'
+ FDO_DISTRIBUTION_VERSION: '14.1'
FDO_DISTRIBUTION_TAG: $FREEBSD_TAG
FC_BUILDSYS: autotools
FC_BUILD_TYPE: shared
@@ -747,17 +656,17 @@ t_freebsd:13.2:autotools shared expat:
MAKE: gmake
FC_BUILD_NO_CHECK: 1
needs:
- - 'freebsd:13.2@container-prep'
+ - 'freebsd:14.1@container-prep'
-t_freebsd:13.2:autotools shared libxml2:
+t_freebsd:14.1:autotools shared libxml2:
extends:
- .build-in-qemu@template
- .fdo.distribution-image@freebsd
- .fc_artifacts
variables:
FC_DISTRO_NAME: freebsd
- FDO_DISTRIBUTION_VERSION: '13.2'
+ FDO_DISTRIBUTION_VERSION: '14.1'
FDO_DISTRIBUTION_TAG: $FREEBSD_TAG
FC_BUILDSYS: autotools
FC_BUILD_TYPE: shared
@@ -765,41 +674,41 @@ t_freebsd:13.2:autotools shared libxml2:
MAKE: gmake
FC_BUILD_NO_CHECK: 1
needs:
- - 'freebsd:13.2@container-prep'
+ - 'freebsd:14.1@container-prep'
-t_freebsd:13.2:meson shared expat:
+t_freebsd:14.1:meson shared expat:
extends:
- .build-in-qemu@template
- .fdo.distribution-image@freebsd
- .fc_artifacts
variables:
FC_DISTRO_NAME: freebsd
- FDO_DISTRIBUTION_VERSION: '13.2'
+ FDO_DISTRIBUTION_VERSION: '14.1'
FDO_DISTRIBUTION_TAG: $FREEBSD_TAG
FC_BUILDSYS: meson
FC_BUILD_TYPE: shared
FC_XML_BACKEND: expat
FC_BUILD_NO_CHECK: 1
needs:
- - 'freebsd:13.2@container-prep'
+ - 'freebsd:14.1@container-prep'
-t_freebsd:13.2:meson shared libxml2:
+t_freebsd:14.1:meson shared libxml2:
extends:
- .build-in-qemu@template
- .fdo.distribution-image@freebsd
- .fc_artifacts
variables:
FC_DISTRO_NAME: freebsd
- FDO_DISTRIBUTION_VERSION: '13.2'
+ FDO_DISTRIBUTION_VERSION: '14.1'
FDO_DISTRIBUTION_TAG: $FREEBSD_TAG
FC_BUILDSYS: meson
FC_BUILD_TYPE: shared
FC_XML_BACKEND: libxml2
FC_BUILD_NO_CHECK: 1
needs:
- - 'freebsd:13.2@container-prep'
+ - 'freebsd:14.1@container-prep'
#######################################
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index dbb53ba..7fda9ed 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -1,4 +1,4 @@
-.default_tag: &default_tag "2024-10-29.1"
+.default_tag: &default_tag "2024-10-31.1"
distributions:
- name: fedora
@@ -77,8 +77,7 @@ distributions:
base_type: freebsd
qemu_based: true
versions:
- - "14.0"
- - "13.2"
+ - "14.1"
builds:
- name: "autotools shared expat"
variables:
@@ -153,7 +152,7 @@ packages:
"ninja",
"wget",
"python3",
- "py39-pip",
+ "py311-pip",
"pkgconf",
"gmake",
"gettext-runtime",
commit 470bca4f0b577df18fe15ef54776b836d740a4fb
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Tue Oct 29 19:47:40 2024 +0900
ci: run check-merge-request on merge request pipelines only
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd8c064..45f298c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -819,6 +819,8 @@ check-merge-request:
reports:
junit: results.xml
allow_failure: true
+ rules:
+ - if: $CI_PIPELINE_SOURCE == "merge_request_event"
pages:
stage: deploy
@@ -835,3 +837,10 @@ pages:
- t_fedora:rawhide:autotools shared libxml2
rules:
- if: $CI_COMMIT_BRANCH == "main" && $CI_PIPELINE_SOURCE != "merge_request_event"
+
+workflow:
+ rules:
+ - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+ - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
+ when: never
+ - if: $CI_COMMIT_BRANCH
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index eb101f9..2ce76cf 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -331,6 +331,8 @@ check-merge-request:
reports:
junit: results.xml
allow_failure: true
+ rules:
+ - if: $CI_PIPELINE_SOURCE == "merge_request_event"
pages:
stage: deploy
@@ -347,3 +349,10 @@ pages:
- t_fedora:rawhide:autotools shared libxml2
rules:
- if: $CI_COMMIT_BRANCH == "main" && $CI_PIPELINE_SOURCE != "merge_request_event"
+
+workflow:
+ rules:
+ - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+ - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
+ when: never
+ - if: $CI_COMMIT_BRANCH
commit 81663ccb170ef85f5183890e6011d318e2b668d0
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Tue Oct 29 19:52:57 2024 +0900
ci: Add Fedora 41 and drop 39
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aab89ac..dd8c064 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 98b1218f146a1ec96d65e3ce0041f9a6ec5cb5e6
+.templates_sha: &template_sha e195d80f35b45cc73668be3767b923fd76c70ed5
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-22.1-3f4457bbcc1d'
- FREEBSD_TAG: '2024-04-22.1-eae64220fd2b'
+ FEDORA_TAG: '2024-10-29.1-41214b06dc2e'
+ FREEBSD_TAG: '2024-10-29.1-07eda677a3b7'
FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh'
FREEBSD_EXEC: 'bash .gitlab-ci/freebsd-install.sh'
@@ -100,22 +100,22 @@ fedora:rawhide@container-prep:
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
-fedora:40@container-prep:
+fedora:41@container-prep:
extends: .fdo.container-build@fedora
stage: prep
variables:
GIT_STRATEGY: none
- FDO_DISTRIBUTION_VERSION: '40'
+ FDO_DISTRIBUTION_VERSION: '41'
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:39@container-prep:
+fedora:40@container-prep:
extends: .fdo.container-build@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
@@ -186,22 +186,22 @@ fedora:rawhide@container-clean:
FDO_DISTRIBUTION_VERSION: 'rawhide'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-fedora:40@container-clean:
+fedora:41@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: '40'
+ FDO_DISTRIBUTION_VERSION: '41'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-fedora:39@container-clean:
+fedora:40@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
freebsd:14.0@container-clean:
@@ -508,69 +508,69 @@ t_fedora:rawhide:mingw meson static expat:
- 'fedora:rawhide@container-prep'
-t_fedora:40:autotools shared expat:
+t_fedora:41:autotools shared expat:
extends:
- .build@template
- .fdo.distribution-image@fedora
- .fc_artifacts
variables:
FC_DISTRO_NAME: fedora
- FDO_DISTRIBUTION_VERSION: '40'
+ FDO_DISTRIBUTION_VERSION: '41'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FC_BUILDSYS: autotools
FC_BUILD_TYPE: shared
FC_XML_BACKEND: expat
needs:
- - 'fedora:40@container-prep'
+ - 'fedora:41@container-prep'
-t_fedora:40:autotools shared libxml2:
+t_fedora:41:autotools shared libxml2:
extends:
- .build@template
- .fdo.distribution-image@fedora
- .fc_artifacts
variables:
FC_DISTRO_NAME: fedora
- FDO_DISTRIBUTION_VERSION: '40'
+ FDO_DISTRIBUTION_VERSION: '41'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FC_BUILDSYS: autotools
FC_BUILD_TYPE: shared
FC_XML_BACKEND: libxml2
FC_BUILD_DISTCHECK: 1
needs:
- - 'fedora:40@container-prep'
+ - 'fedora:41@container-prep'
-t_fedora:40:meson shared expat:
+t_fedora:41:meson shared expat:
extends:
- .build@template
- .fdo.distribution-image@fedora
- .fc_artifacts
variables:
FC_DISTRO_NAME: fedora
- FDO_DISTRIBUTION_VERSION: '40'
+ FDO_DISTRIBUTION_VERSION: '41'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FC_BUILDSYS: meson
FC_BUILD_TYPE: shared
FC_XML_BACKEND: expat
needs:
- - 'fedora:40@container-prep'
+ - 'fedora:41@container-prep'
-t_fedora:40:meson shared libxml2:
+t_fedora:41:meson shared libxml2:
extends:
- .build@template
- .fdo.distribution-image@fedora
- .fc_artifacts
variables:
FC_DISTRO_NAME: fedora
- FDO_DISTRIBUTION_VERSION: '40'
+ FDO_DISTRIBUTION_VERSION: '41'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FC_BUILDSYS: meson
FC_BUILD_TYPE: shared
FC_XML_BACKEND: libxml2
needs:
- - 'fedora:40@container-prep'
+ - 'fedora:41@container-prep'
@@ -585,69 +585,69 @@ t_fedora:40:meson shared libxml2:
-t_fedora:39:autotools shared expat:
+t_fedora:40:autotools shared expat:
extends:
- .build@template
- .fdo.distribution-image@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@container-prep'
+ - 'fedora:40@container-prep'
-t_fedora:39:autotools shared libxml2:
+t_fedora:40:autotools shared libxml2:
extends:
- .build@template
- .fdo.distribution-image@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@container-prep'
+ - 'fedora:40@container-prep'
-t_fedora:39:meson shared expat:
+t_fedora:40:meson shared expat:
extends:
- .build@template
- .fdo.distribution-image@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@container-prep'
+ - 'fedora:40@container-prep'
-t_fedora:39:meson shared libxml2:
+t_fedora:40:meson shared libxml2:
extends:
- .build@template
- .fdo.distribution-image@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@container-prep'
+ - 'fedora:40@container-prep'
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index ca20c1c..dbb53ba 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -1,4 +1,4 @@
-.default_tag: &default_tag "2024-04-22.1"
+.default_tag: &default_tag "2024-10-29.1"
distributions:
- name: fedora
@@ -7,8 +7,8 @@ distributions:
qemu_based: false
versions:
- "rawhide"
+ - "41"
- "40"
- - "39"
builds:
- name: "autotools shared expat"
variables:
commit 040e81abed0034612c70cc300344a72508180417
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Tue Oct 29 19:49:27 2024 +0900
ci: rebase ci-templates
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 1ddfdbe..eb101f9 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 98b1218f146a1ec96d65e3ce0041f9a6ec5cb5e6
+.templates_sha: &template_sha e195d80f35b45cc73668be3767b923fd76c70ed5
include:
{% for distro in distributions|sort(attribute="name") %}
