diff options
| author | Alex Richardson <arichardson@FreeBSD.org> | 2022-08-09 17:49:23 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2022-08-10 11:18:20 +0000 |
| commit | 82d5ee848d6374a553c5543d5f3cf75c0fac9c19 (patch) | |
| tree | 9c5d98cadc051a8ed20cb8df8bb42e0b0f7b9c80 /.gitlab-ci.yml | |
| parent | ee880ef811589d2533880af57b904920dfa76f6a (diff) | |
| download | dbus-82d5ee848d6374a553c5543d5f3cf75c0fac9c19.tar.gz | |
gitlab-ci: Add a FreeBSD meson job
Also bump the FDO_DISTRIBUTION_TAG to ensure the disk images
include meson.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f46e6ce1..8136308b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: |