[glib/2325-symlink-replace-file: 5/5] ci: Set localstatedir to the system directory on FreeBSD CI machines
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/2325-symlink-replace-file: 5/5] ci: Set localstatedir to the system directory on FreeBSD CI machines
- Date: Wed, 10 Mar 2021 17:55:55 +0000 (UTC)
commit 8f57a5b9ad9b79f1699a50ec1e4a184add924629
Author: Philip Withnall <pwithnall endlessos org>
Date: Wed Mar 10 17:47:18 2021 +0000
ci: Set localstatedir to the system directory on FreeBSD CI machines
These changes were missing from commit 62cc3158e9 and broke CI on
FreeBSD.
Signed-off-by: Philip Withnall <pwithnall endlessos org>
.gitlab-ci.yml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e6b29dd04..05e473138 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -357,7 +357,8 @@ freebsd-11-x86_64:
# FreeBSD iconv doesn't handle transliteration, so we use (external) GNU libiconv here.
# FreeBSD supports xattr, but its API is different from Linux xattr.
# FIXME: extattr(2) support: https://gitlab.gnome.org/GNOME/glib/issues/1404
- - meson ${MESON_COMMON_OPTIONS} -Db_lundef=false -Diconv=external -Dxattr=false _build
+ # localstatedir is needed for access to /var/lib/dbus/machine-id
+ - meson ${MESON_COMMON_OPTIONS} --localstatedir=/var -Db_lundef=false -Diconv=external -Dxattr=false
_build
- ninja -C _build
- bash -x ./.gitlab-ci/run-tests.sh
artifacts:
@@ -385,7 +386,7 @@ freebsd-12-x86_64:
before_script:
- bash .gitlab-ci/show-execution-environment.sh
script:
- - meson ${MESON_COMMON_OPTIONS} -Db_lundef=false -Diconv=external -Dxattr=false _build
+ - meson ${MESON_COMMON_OPTIONS} --localstatedir=/var -Db_lundef=false -Diconv=external -Dxattr=false
_build
- ninja -C _build
- bash -x ./.gitlab-ci/run-tests.sh
except:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]