.gitlab-ci.yml | 116 ++++++++++++++++++++++++-------------------------
.gitlab-ci/ci.template | 2
.gitlab-ci/config.yml | 4 -
3 files changed, 61 insertions(+), 61 deletions(-)
New commits:
commit e0f44326cb9d9beb842c5b7c47891f95e11c03dc
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Tue Dec 5 13:14:15 2023 +0900
.gitlab-ci: Update
* Add Fedora 39 and drop 37
* Update the base template
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de2ae93..e66d15c 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 81a36b5c5349fd3222036bb3caa0166083a3fd44
+.templates_sha: &template_sha d11c0dd4c1c9a69c14b4af9b50cdd12b89d24672
include:
# Fedora container builder template
@@ -35,7 +35,7 @@ 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-07-15.0-029bccad11f1'
+ FEDORA_TAG: '2023-12-05.0-e56dbdc02823'
FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh'
@@ -58,22 +58,22 @@ fedora:rawhide@container-prep:
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
-fedora:38@container-prep:
+fedora:39@container-prep:
extends: .fdo.container-build@fedora
stage: prep
variables:
GIT_STRATEGY: none
- FDO_DISTRIBUTION_VERSION: '38'
+ FDO_DISTRIBUTION_VERSION: '39'
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-gettext mingw64-freetype mingw64-libxml2 wine'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
-fedora:37@container-prep:
+fedora:38@container-prep:
extends: .fdo.container-build@fedora
stage: prep
variables:
GIT_STRATEGY: none
- FDO_DISTRIBUTION_VERSION: '37'
+ FDO_DISTRIBUTION_VERSION: '38'
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-gettext mingw64-freetype mingw64-libxml2 wine'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
@@ -120,22 +120,22 @@ fedora:rawhide@container-clean:
FDO_DISTRIBUTION_VERSION: 'rawhide'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-fedora:38@container-clean:
+fedora:39@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: '38'
+ FDO_DISTRIBUTION_VERSION: '39'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-fedora:37@container-clean:
+fedora:38@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: '37'
+ FDO_DISTRIBUTION_VERSION: '38'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
@@ -326,79 +326,79 @@ t_fedora:rawhide:mingw meson static expat:
- 'fedora:rawhide@container-prep'
-t_fedora:38:autotools shared expat:
+t_fedora:39:autotools shared expat:
extends:
- .build@template
- .fdo.distribution-image@fedora
- .fc_artifacts
variables:
FC_DISTRO_NAME: fedora
- FDO_DISTRIBUTION_VERSION: '38'
+ FDO_DISTRIBUTION_VERSION: '39'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FC_BUILDSYS: autotools
FC_BUILD_TYPE: shared
FC_XML_BACKEND: expat
needs:
- - 'fedora:38@container-prep'
+ - 'fedora:39@container-prep'
-t_fedora:38:autotools shared libxml2:
+t_fedora:39:autotools shared libxml2:
extends:
- .build@template
- .fdo.distribution-image@fedora
- .fc_artifacts
variables:
FC_DISTRO_NAME: fedora
- FDO_DISTRIBUTION_VERSION: '38'
+ FDO_DISTRIBUTION_VERSION: '39'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FC_BUILDSYS: autotools
FC_BUILD_TYPE: shared
FC_XML_BACKEND: libxml2
FC_BUILD_DISTCHECK: 1
needs:
- - 'fedora:38@container-prep'
+ - 'fedora:39@container-prep'
-t_fedora:38:autotools static expat:
+t_fedora:39:autotools static expat:
extends:
- .build@template
- .fdo.distribution-image@fedora
- .fc_artifacts
variables:
FC_DISTRO_NAME: fedora
- FDO_DISTRIBUTION_VERSION: '38'
+ FDO_DISTRIBUTION_VERSION: '39'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FC_BUILDSYS: autotools
FC_BUILD_TYPE: static
FC_XML_BACKEND: expat
needs:
- - 'fedora:38@container-prep'
+ - 'fedora:39@container-prep'
-t_fedora:38:autotools static libxml2:
+t_fedora:39:autotools static libxml2:
extends:
- .build@template
- .fdo.distribution-image@fedora
- .fc_artifacts
variables:
FC_DISTRO_NAME: fedora
- FDO_DISTRIBUTION_VERSION: '38'
+ FDO_DISTRIBUTION_VERSION: '39'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FC_BUILDSYS: autotools
FC_BUILD_TYPE: static
FC_XML_BACKEND: libxml2
needs:
- - 'fedora:38@container-prep'
+ - 'fedora:39@container-prep'
-t_fedora:38:mingw autotools static libxml2:
+t_fedora:39:mingw autotools static libxml2:
extends:
- .build@template
- .fdo.distribution-image@fedora
- .fc_artifacts
variables:
FC_DISTRO_NAME: fedora
- FDO_DISTRIBUTION_VERSION: '38'
+ FDO_DISTRIBUTION_VERSION: '39'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FC_BUILDSYS: autotools
FC_BUILD_TYPE: static
@@ -406,49 +406,49 @@ t_fedora:38:mingw autotools static libxml2:
FC_BUILD_PLATFORM: mingw
FC_BUILD_ARCH: x86_64-mingw32
needs:
- - 'fedora:38@container-prep'
+ - 'fedora:39@container-prep'
-t_fedora:38:meson shared expat:
+t_fedora:39:meson shared expat:
extends:
- .build@template
- .fdo.distribution-image@fedora
- .fc_artifacts
variables:
FC_DISTRO_NAME: fedora
- FDO_DISTRIBUTION_VERSION: '38'
+ FDO_DISTRIBUTION_VERSION: '39'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FC_BUILDSYS: meson
FC_BUILD_TYPE: shared
FC_XML_BACKEND: expat
needs:
- - 'fedora:38@container-prep'
+ - 'fedora:39@container-prep'
-t_fedora:38:meson static expat:
+t_fedora:39:meson static expat:
extends:
- .build@template
- .fdo.distribution-image@fedora
- .fc_artifacts
variables:
FC_DISTRO_NAME: fedora
- FDO_DISTRIBUTION_VERSION: '38'
+ FDO_DISTRIBUTION_VERSION: '39'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FC_BUILDSYS: meson
FC_BUILD_TYPE: static
FC_XML_BACKEND: expat
needs:
- - 'fedora:38@container-prep'
+ - 'fedora:39@container-prep'
-t_fedora:38:mingw meson static expat:
+t_fedora:39:mingw meson static expat:
extends:
- .build@template
- .fdo.distribution-image@fedora
- .fc_artifacts
variables:
FC_DISTRO_NAME: fedora
- FDO_DISTRIBUTION_VERSION: '38'
+ FDO_DISTRIBUTION_VERSION: '39'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FC_BUILDSYS: meson
FC_BUILD_TYPE: static
@@ -457,82 +457,82 @@ t_fedora:38:mingw meson static expat:
FC_BUILD_ARCH: linux-mingw-w64-64bit
FC_BUILD_NO_INSTALL: 1
needs:
- - 'fedora:38@container-prep'
+ - 'fedora:39@container-prep'
-t_fedora:37:autotools shared expat:
+t_fedora:38:autotools shared expat:
extends:
- .build@template
- .fdo.distribution-image@fedora
- .fc_artifacts
variables:
FC_DISTRO_NAME: fedora
- FDO_DISTRIBUTION_VERSION: '37'
+ FDO_DISTRIBUTION_VERSION: '38'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FC_BUILDSYS: autotools
FC_BUILD_TYPE: shared
FC_XML_BACKEND: expat
needs:
- - 'fedora:37@container-prep'
+ - 'fedora:38@container-prep'
-t_fedora:37:autotools shared libxml2:
+t_fedora:38:autotools shared libxml2:
extends:
- .build@template
- .fdo.distribution-image@fedora
- .fc_artifacts
variables:
FC_DISTRO_NAME: fedora
- FDO_DISTRIBUTION_VERSION: '37'
+ FDO_DISTRIBUTION_VERSION: '38'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FC_BUILDSYS: autotools
FC_BUILD_TYPE: shared
FC_XML_BACKEND: libxml2
FC_BUILD_DISTCHECK: 1
needs:
- - 'fedora:37@container-prep'
+ - 'fedora:38@container-prep'
-t_fedora:37:autotools static expat:
+t_fedora:38:autotools static expat:
extends:
- .build@template
- .fdo.distribution-image@fedora
- .fc_artifacts
variables:
FC_DISTRO_NAME: fedora
- FDO_DISTRIBUTION_VERSION: '37'
+ FDO_DISTRIBUTION_VERSION: '38'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FC_BUILDSYS: autotools
FC_BUILD_TYPE: static
FC_XML_BACKEND: expat
needs:
- - 'fedora:37@container-prep'
+ - 'fedora:38@container-prep'
-t_fedora:37:autotools static libxml2:
+t_fedora:38:autotools static libxml2:
extends:
- .build@template
- .fdo.distribution-image@fedora
- .fc_artifacts
variables:
FC_DISTRO_NAME: fedora
- FDO_DISTRIBUTION_VERSION: '37'
+ FDO_DISTRIBUTION_VERSION: '38'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FC_BUILDSYS: autotools
FC_BUILD_TYPE: static
FC_XML_BACKEND: libxml2
needs:
- - 'fedora:37@container-prep'
+ - 'fedora:38@container-prep'
-t_fedora:37:mingw autotools static libxml2:
+t_fedora:38:mingw autotools static libxml2:
extends:
- .build@template
- .fdo.distribution-image@fedora
- .fc_artifacts
variables:
FC_DISTRO_NAME: fedora
- FDO_DISTRIBUTION_VERSION: '37'
+ FDO_DISTRIBUTION_VERSION: '38'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FC_BUILDSYS: autotools
FC_BUILD_TYPE: static
@@ -540,49 +540,49 @@ t_fedora:37:mingw autotools static libxml2:
FC_BUILD_PLATFORM: mingw
FC_BUILD_ARCH: x86_64-mingw32
needs:
- - 'fedora:37@container-prep'
+ - 'fedora:38@container-prep'
-t_fedora:37:meson shared expat:
+t_fedora:38:meson shared expat:
extends:
- .build@template
- .fdo.distribution-image@fedora
- .fc_artifacts
variables:
FC_DISTRO_NAME: fedora
- FDO_DISTRIBUTION_VERSION: '37'
+ FDO_DISTRIBUTION_VERSION: '38'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FC_BUILDSYS: meson
FC_BUILD_TYPE: shared
FC_XML_BACKEND: expat
needs:
- - 'fedora:37@container-prep'
+ - 'fedora:38@container-prep'
-t_fedora:37:meson static expat:
+t_fedora:38:meson static expat:
extends:
- .build@template
- .fdo.distribution-image@fedora
- .fc_artifacts
variables:
FC_DISTRO_NAME: fedora
- FDO_DISTRIBUTION_VERSION: '37'
+ FDO_DISTRIBUTION_VERSION: '38'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FC_BUILDSYS: meson
FC_BUILD_TYPE: static
FC_XML_BACKEND: expat
needs:
- - 'fedora:37@container-prep'
+ - 'fedora:38@container-prep'
-t_fedora:37:mingw meson static expat:
+t_fedora:38:mingw meson static expat:
extends:
- .build@template
- .fdo.distribution-image@fedora
- .fc_artifacts
variables:
FC_DISTRO_NAME: fedora
- FDO_DISTRIBUTION_VERSION: '37'
+ FDO_DISTRIBUTION_VERSION: '38'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FC_BUILDSYS: meson
FC_BUILD_TYPE: static
@@ -591,6 +591,6 @@ t_fedora:37:mingw meson static expat:
FC_BUILD_ARCH: linux-mingw-w64-64bit
FC_BUILD_NO_INSTALL: 1
needs:
- - 'fedora:37@container-prep'
+ - 'fedora:38@container-prep'
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 54715a1..3612421 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 81a36b5c5349fd3222036bb3caa0166083a3fd44
+.templates_sha: &template_sha d11c0dd4c1c9a69c14b4af9b50cdd12b89d24672
include:
{% for distro in distributions|sort(attribute="name") %}
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index ecb9e1a..968d7e2 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -1,4 +1,4 @@
-.default_tag: &default_tag "2023-07-15.0"
+.default_tag: &default_tag "2023-12-05.0"
distributions:
- name: fedora
@@ -6,8 +6,8 @@ distributions:
base_type: fedora
versions:
- "rawhide"
+ - "39"
- "38"
- - "37"
builds:
- name: "autotools shared expat"
variables:
