Merge branch 'wip/lantw/enable-freebsd-ci-only-in-gnome' into 'master'

ci: Enable FreeBSD CI in the official repository

See merge request GNOME/glib!387
This commit is contained in:
Philip Withnall 2018-10-09 21:08:54 +00:00
commit d3928abe45

View File

@ -128,8 +128,9 @@ vs2017-x64:
- _build/meson-logs - _build/meson-logs
freebsd-11-x86_64: freebsd-11-x86_64:
when: manual
stage: build stage: build
only:
- branches@GNOME/glib
tags: tags:
# To run a FreeBSD builder, install gitlab-runner package and start both # To run a FreeBSD builder, install gitlab-runner package and start both
# gitlab-runner and dbus service because we need /var/lib/dbus/machine-id. # gitlab-runner and dbus service because we need /var/lib/dbus/machine-id.
@ -154,9 +155,6 @@ freebsd-11-x86_64:
- meson ${MESON_COMMON_OPTIONS} -Db_lundef=false -Diconv=gnu -Dxattr=false _build - meson ${MESON_COMMON_OPTIONS} -Db_lundef=false -Diconv=gnu -Dxattr=false _build
- ninja -C _build - ninja -C _build
- meson test -C _build --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" - meson test -C _build --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}"
# FIXME: Remove this when we have a stable FreeBSD runner
# https://gitlab.gnome.org/Infrastructure/GitLab/issues/286
allow_failure: true
except: except:
- tags - tags
artifacts: artifacts: