From 51160281e3c8eec793099ad5d5f0d1ed762d8d9b Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Wed, 6 Dec 2023 19:21:38 +0900 Subject: [PATCH] CI: static build only for rawhide --- .gitlab-ci.yml | 242 ++++++++--------------------------------- .gitlab-ci/ci.template | 2 + .gitlab-ci/config.yml | 25 +++-- 3 files changed, 63 insertions(+), 206 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4899faf..c6434f3 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-7b7a4d882550' - FREEBSD_TAG: '2023-12-05.1-9e4cd5a85377' + FEDORA_TAG: '2023-12-05.1-7c59f403cca5' + FREEBSD_TAG: '2023-12-05.1-b3f6fd9ee634' FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh' FREEBSD_EXEC: 'bash .gitlab-ci/freebsd-install.sh' @@ -372,6 +372,22 @@ t_fedora:rawhide:autotools shared libxml2: - 'fedora:rawhide@container-prep' +t_fedora:rawhide:meson shared expat: + 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: meson + FC_BUILD_TYPE: shared + FC_XML_BACKEND: expat + needs: + - 'fedora:rawhide@container-prep' + + t_fedora:rawhide:autotools static expat: extends: - .build@template @@ -404,6 +420,22 @@ t_fedora:rawhide:autotools static libxml2: - 'fedora:rawhide@container-prep' +t_fedora:rawhide:meson static expat: + 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: meson + FC_BUILD_TYPE: static + FC_XML_BACKEND: expat + needs: + - 'fedora:rawhide@container-prep' + + t_fedora:rawhide:mingw autotools static libxml2: extends: - .build@template @@ -422,38 +454,6 @@ t_fedora:rawhide:mingw autotools static libxml2: - 'fedora:rawhide@container-prep' -t_fedora:rawhide:meson shared expat: - 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: meson - FC_BUILD_TYPE: shared - FC_XML_BACKEND: expat - needs: - - 'fedora:rawhide@container-prep' - - -t_fedora:rawhide:meson static expat: - 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: meson - FC_BUILD_TYPE: static - FC_XML_BACKEND: expat - needs: - - 'fedora:rawhide@container-prep' - - t_fedora:rawhide:mingw meson static expat: extends: - .build@template @@ -506,56 +506,6 @@ t_fedora:39:autotools shared libxml2: - 'fedora:39@container-prep' -t_fedora:39:autotools static expat: - extends: - - .build@template - - .fdo.distribution-image@fedora - - .fc_artifacts - variables: - FC_DISTRO_NAME: fedora - FDO_DISTRIBUTION_VERSION: '39' - FDO_DISTRIBUTION_TAG: $FEDORA_TAG - FC_BUILDSYS: autotools - FC_BUILD_TYPE: static - FC_XML_BACKEND: expat - needs: - - 'fedora:39@container-prep' - - -t_fedora:39:autotools static libxml2: - extends: - - .build@template - - .fdo.distribution-image@fedora - - .fc_artifacts - variables: - FC_DISTRO_NAME: fedora - FDO_DISTRIBUTION_VERSION: '39' - FDO_DISTRIBUTION_TAG: $FEDORA_TAG - FC_BUILDSYS: autotools - FC_BUILD_TYPE: static - FC_XML_BACKEND: libxml2 - needs: - - 'fedora:39@container-prep' - - -t_fedora:39:mingw autotools static libxml2: - extends: - - .build@template - - .fdo.distribution-image@fedora - - .fc_artifacts - variables: - FC_DISTRO_NAME: fedora - FDO_DISTRIBUTION_VERSION: '39' - 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:39@container-prep' - - t_fedora:39:meson shared expat: extends: - .build@template @@ -572,39 +522,14 @@ t_fedora:39:meson shared expat: - 'fedora:39@container-prep' -t_fedora:39:meson static expat: - extends: - - .build@template - - .fdo.distribution-image@fedora - - .fc_artifacts - variables: - FC_DISTRO_NAME: fedora - FDO_DISTRIBUTION_VERSION: '39' - FDO_DISTRIBUTION_TAG: $FEDORA_TAG - FC_BUILDSYS: meson - FC_BUILD_TYPE: static - FC_XML_BACKEND: expat - needs: - - 'fedora:39@container-prep' -t_fedora:39:mingw meson static expat: - extends: - - .build@template - - .fdo.distribution-image@fedora - - .fc_artifacts - variables: - FC_DISTRO_NAME: fedora - FDO_DISTRIBUTION_VERSION: '39' - FDO_DISTRIBUTION_TAG: $FEDORA_TAG - FC_BUILDSYS: meson - FC_BUILD_TYPE: static - FC_XML_BACKEND: expat - FC_BUILD_PLATFORM: mingw - FC_BUILD_ARCH: linux-mingw-w64-64bit - FC_BUILD_NO_INSTALL: 1 - needs: - - 'fedora:39@container-prep' + + + + + + t_fedora:38:autotools shared expat: @@ -640,56 +565,6 @@ t_fedora:38:autotools shared libxml2: - 'fedora:38@container-prep' -t_fedora:38:autotools static expat: - extends: - - .build@template - - .fdo.distribution-image@fedora - - .fc_artifacts - variables: - FC_DISTRO_NAME: fedora - FDO_DISTRIBUTION_VERSION: '38' - FDO_DISTRIBUTION_TAG: $FEDORA_TAG - FC_BUILDSYS: autotools - FC_BUILD_TYPE: static - FC_XML_BACKEND: expat - needs: - - 'fedora:38@container-prep' - - -t_fedora:38:autotools static libxml2: - extends: - - .build@template - - .fdo.distribution-image@fedora - - .fc_artifacts - variables: - FC_DISTRO_NAME: fedora - FDO_DISTRIBUTION_VERSION: '38' - FDO_DISTRIBUTION_TAG: $FEDORA_TAG - FC_BUILDSYS: autotools - FC_BUILD_TYPE: static - FC_XML_BACKEND: libxml2 - needs: - - 'fedora:38@container-prep' - - -t_fedora:38:mingw autotools static libxml2: - extends: - - .build@template - - .fdo.distribution-image@fedora - - .fc_artifacts - variables: - FC_DISTRO_NAME: fedora - FDO_DISTRIBUTION_VERSION: '38' - 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:38@container-prep' - - t_fedora:38:meson shared expat: extends: - .build@template @@ -706,39 +581,14 @@ t_fedora:38:meson shared expat: - 'fedora:38@container-prep' -t_fedora:38:meson static expat: - extends: - - .build@template - - .fdo.distribution-image@fedora - - .fc_artifacts - variables: - FC_DISTRO_NAME: fedora - FDO_DISTRIBUTION_VERSION: '38' - FDO_DISTRIBUTION_TAG: $FEDORA_TAG - FC_BUILDSYS: meson - FC_BUILD_TYPE: static - FC_XML_BACKEND: expat - needs: - - 'fedora:38@container-prep' -t_fedora:38:mingw meson static expat: - extends: - - .build@template - - .fdo.distribution-image@fedora - - .fc_artifacts - variables: - FC_DISTRO_NAME: fedora - FDO_DISTRIBUTION_VERSION: '38' - FDO_DISTRIBUTION_TAG: $FEDORA_TAG - FC_BUILDSYS: meson - FC_BUILD_TYPE: static - FC_XML_BACKEND: expat - FC_BUILD_PLATFORM: mingw - FC_BUILD_ARCH: linux-mingw-w64-64bit - FC_BUILD_NO_INSTALL: 1 - needs: - - 'fedora:38@container-prep' + + + + + + t_freebsd:14.0:autotools shared expat: diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index c7fd321..3a1f662 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -283,6 +283,7 @@ check-ci-script: {% for version in distro.versions %} {% for build in distro.builds %} +{% if not 'build_only' in build or build.build_only == version %} t_{{distro.name}}:{{version}}:{{build.name}}: extends: {% if distro.qemu_based %} @@ -304,6 +305,7 @@ t_{{distro.name}}:{{version}}:{{build.name}}: {% endif %} needs: - '{{distro.name}}:{{version}}@container-prep' +{% endif %} {% endfor %} {% endfor %} diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index 21ee147..d3547f0 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -21,34 +21,39 @@ distributions: FC_BUILD_TYPE: shared FC_XML_BACKEND: libxml2 FC_BUILD_DISTCHECK: 1 + - name: "meson shared expat" + variables: + FC_BUILDSYS: meson + FC_BUILD_TYPE: shared + FC_XML_BACKEND: expat - name: "autotools static expat" + build_only: "rawhide" variables: FC_BUILDSYS: autotools FC_BUILD_TYPE: static FC_XML_BACKEND: expat - name: "autotools static libxml2" + build_only: "rawhide" variables: FC_BUILDSYS: autotools FC_BUILD_TYPE: static FC_XML_BACKEND: libxml2 + - name: "meson static expat" + build_only: "rawhide" + variables: + FC_BUILDSYS: meson + FC_BUILD_TYPE: static + FC_XML_BACKEND: expat - name: "mingw autotools static libxml2" + build_only: "rawhide" variables: FC_BUILDSYS: autotools FC_BUILD_TYPE: static FC_XML_BACKEND: libxml2 FC_BUILD_PLATFORM: mingw FC_BUILD_ARCH: x86_64-mingw32 - - name: "meson shared expat" - variables: - FC_BUILDSYS: meson - FC_BUILD_TYPE: shared - FC_XML_BACKEND: expat - - name: "meson static expat" - variables: - FC_BUILDSYS: meson - FC_BUILD_TYPE: static - FC_XML_BACKEND: expat - name: "mingw meson static expat" + build_only: "rawhide" variables: FC_BUILDSYS: meson FC_BUILD_TYPE: static