From 8e2f8298708fbd208714ac46fe163086036812d5 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 20 Mar 2024 17:17:30 +0100 Subject: [PATCH] (submit/ci-freebsd) ci: refactor distro variables Moving out the distro variables (FDO_DISTRIBUTION_*) out of the global variables and introduce target templates for that. Now the debian-based builds extent .xorg-image@debian, the freebsd-based using .xorg-image@freebsd. Signed-off-by: Enrico Weigelt, metux IT consult --- .gitlab-ci.yml | 52 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 01b37e23a..918cd5d0d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,14 +16,15 @@ # gcc/clang or other packages, which might break the build with older commits # using the same tag. variables: - FDO_UPSTREAM_REPO: xorg/xserver - FDO_DISTRIBUTION_VERSION: bullseye-slim - FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh' - FDO_DISTRIBUTION_TAG: "2024-03-26-explicit-sync-2" - FDO_FREEBSD_DISTRIBUTION_TAG: '2024-03-21.0' - FDO_FREEBSD_DISTRIBUTION_VERSION: '14.0' - MESON_BUILDDIR: "build" + FDO_UPSTREAM_REPO: xorg/xserver + MESON_BUILDDIR: "build" REPO_URL_XORGPROTO: 'https://gitlab.freedesktop.org/xorg/proto/xorgproto.git' + XORG_DEBIAN_VERSION: 'bullseye-slim' + XORG_DEBIAN_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh' + XORG_DEBIAN_TAG: '2024-03-26-explicit-sync-2' + XORG_FREEBSD_VERSION: '14.0' + XORG_FREEBSD_EXEC: '' + XORG_FREEBSD_TAG: '2024-04-25.0' include: - project: 'freedesktop/ci-templates' @@ -107,21 +108,42 @@ debian-bullseye: stage: docker-image variables: GIT_STRATEGY: none + FDO_DISTRIBUTION_VERSION: "$XORG_DEBIAN_VERSION" + FDO_DISTRIBUTION_EXEC: "$XORG_DEBIAN_EXEC" + FDO_DISTRIBUTION_TAG: "$XORG_DEBIAN_TAG" freebsd-image: extends: - .fdo.qemu-build@freebsd@x86_64 stage: docker-image variables: - GIT_STRATEGY: none - FDO_DISTRIBUTION_TAG: '${FDO_FREEBSD_DISTRIBUTION_TAG}' - FDO_DISTRIBUTION_VERSION: '${FDO_FREEBSD_DISTRIBUTION_VERSION}' + GIT_STRATEGY: none + FDO_DISTRIBUTION_TAG: "$XORG_FREEBSD_TAG" + FDO_DISTRIBUTION_VERSION: "$XORG_FREEBSD_VERSION" FDO_DISTRIBUTION_EXEC: '' FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake libtool xorg-macros xorgproto bash meson ninja pixman xtrans libXau libXdmcp libXfont2 libxkbfile libxcvt libpciaccess font-util' -.common-build-and-test: +.xorg-image@debian: extends: - .fdo.distribution-image@debian + variables: + FDO_DISTRIBUTION_VERSION: "$XORG_DEBIAN_VERSION" + FDO_DISTRIBUTION_EXEC: "$XORG_DEBIAN_EXEC" + FDO_DISTRIBUTION_TAG: "$XORG_DEBIAN_TAG" + +.xorg-image@freebsd: + extends: + - .fdo.distribution-image@freebsd + variables: + GIT_DEPTH: 1 + PKG_CONFIG_PATH: /usr/share/pkgconfig:/usr/lib/pkgconfig:/usr/pkg/share/pkgconfig:/usr/pkg/lib/pkgconfig:/usr/local/libdata/pkgconfig + FDO_DISTRIBUTION_VERSION: "$XORG_FREEBSD_VERSION" + FDO_DISTRIBUTION_EXEC: "$XORG_FREEBSD_EXEC" + FDO_DISTRIBUTION_TAG: "$XORG_FREEBSD_TAG" + +.common-build-and-test: + extends: + - .xorg-image@debian - .ci-run-policy stage: build-and-test artifacts: @@ -174,13 +196,9 @@ mingw-cross-build: freebsd: stage: build-and-test extends: - - .fdo.distribution-image@freebsd + - .xorg-image@freebsd variables: - FDO_DISTRIBUTION_TAG: '$FDO_FREEBSD_DISTRIBUTION_TAG' - FDO_DISTRIBUTION_VERSION: '$FDO_FREEBSD_DISTRIBUTION_VERSION' MESON_ARGS: -Dglx=false -Dglamor=false -Dudev=false -Dudev_kms=false - GIT_DEPTH: 1 - PKG_CONFIG_PATH: /usr/share/pkgconfig:/usr/lib/pkgconfig:/usr/pkg/share/pkgconfig:/usr/pkg/lib/pkgconfig:/usr/local/libdata/pkgconfig script: # running of of disk space without this # needed until https://gitlab.freedesktop.org/freedesktop/ci-templates/-/issues/67 is fixed @@ -216,7 +234,7 @@ meson-dist: xf86-driver-build-test: extends: - - .fdo.distribution-image@debian + - .xorg-image@debian - .ci-run-policy stage: drivers parallel: