mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-01-04 19:00:17 +01:00
gitlab-ci: Add a FreeBSD meson job
Also bump the FDO_DISTRIBUTION_TAG to ensure the disk images include meson.
This commit is contained in:
parent
ee880ef811
commit
82d5ee848d
1 changed files with 13 additions and 1 deletions
|
|
@ -72,7 +72,7 @@ variables:
|
|||
BUILD_OS: freebsd
|
||||
BUILD_ARCH: "x86_64"
|
||||
FDO_DISTRIBUTION_VERSION: '13.0'
|
||||
FDO_DISTRIBUTION_TAG: '2022-08-08.1' # Bump this version on every ci-install.sh change
|
||||
FDO_DISTRIBUTION_TAG: '2022-08-09.0' # Bump this version on every ci-install.sh change
|
||||
FDO_REPO_SUFFIX: "$BUILD_OS/$BUILD_ARCH"
|
||||
|
||||
.cmake-common:
|
||||
|
|
@ -417,6 +417,7 @@ freebsd image:
|
|||
- /app/vmctl exec "cd $CI_PROJECT_NAME && env make=gmake builddir=$builddir $(echo $(env | grep "ci_.*=")) bash -x ./tools/ci-build.sh $CI_BUILD_ARGS"
|
||||
# Copy build artifacts from the VM for archiving/JUnit XML display
|
||||
- mkdir -p "$builddir"
|
||||
- rsync -av "vm:$CI_PROJECT_NAME/$builddir/meson-logs" "$builddir/" || true
|
||||
- scp -v "vm:$CI_PROJECT_NAME/$builddir/config.h" . || true
|
||||
- scp -v "vm:$ci_cmake_junit_output" "$ci_cmake_junit_output" || true
|
||||
# Finally, shut down the VM.
|
||||
|
|
@ -469,4 +470,15 @@ freebsd autotools:
|
|||
ci_variant: "production-no-upload-docs"
|
||||
CI_BUILD_ARGS: "--enable-xml-docs"
|
||||
|
||||
freebsd meson:
|
||||
extends:
|
||||
- .build-env-freebsd
|
||||
- .meson-common
|
||||
variables:
|
||||
# On FreeBSD the `environ` symbol is provided by the c startup code and is
|
||||
# only defined in the main executable and not available in libc.so, so
|
||||
# building with -Wl,-no-undefined results in errors.
|
||||
# See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=263265.
|
||||
CI_BUILD_ARGS: "-Db_lundef=false"
|
||||
|
||||
# vim:set sw=2 sts=2 et:
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue