summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorTing-Wei Lan <lantw@src.gnome.org>2018-10-09 22:54:48 +0800
committerTing-Wei Lan <lantw@src.gnome.org>2018-10-09 23:06:06 +0800
commitfb8d95467da03e8b7cc1a6f13e09a7187c6d9b4f (patch)
treee870fb3c4470b5966b4c4334be949e4800db6df6 /.gitlab-ci.yml
parentfb65dda651e7a46e4dee71ec6b810edeb17a9c33 (diff)
downloadglib-fb8d95467da03e8b7cc1a6f13e09a7187c6d9b4f.tar.gz
ci: Enable FreeBSD CI in the official repository
Since we are unable to promote our FreeBSD runner to a shared runner, we can only enable it in GNOME group. This should avoid problems when submitting merge requests from forks.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml6
1 files changed, 2 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 96d11f805..936c97669 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -128,8 +128,9 @@ vs2017-x64:
- _build/meson-logs
freebsd-11-x86_64:
- when: manual
stage: build
+ only:
+ - branches@GNOME/glib
tags:
# 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.
@@ -154,9 +155,6 @@ freebsd-11-x86_64:
- meson ${MESON_COMMON_OPTIONS} -Db_lundef=false -Diconv=gnu -Dxattr=false _build
- ninja -C _build
- 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:
- tags
artifacts: