aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Ådahl <jadahl@gmail.com>2021-03-31 08:39:03 +0200
committerJonas Ådahl <jadahl@gmail.com>2021-03-31 08:44:50 +0200
commit42da22947b0808d73a63c7f8f6b16efe7944f729 (patch)
treed4de9012ee14e4e0e1cd55e7a72ed9e34e8d058c
parent0cf92d7ad1014f5000cdbce812124ff9f7e23fc7 (diff)
ci: Make the FDO_UPSTREAM_REPO variable global
ci-fairy doesn't know how to to look at $CI_MERGE_REQUEST_PROJECT_PATH right now, so if we don't manually set $FDO_UPSTREAM_REPO, ci-fairy will (without verbose logging turned on) silently fall back on the source repository project path for finding the branch point. This might fail if the owner of the source repository hasn't updated the `master` branch of their fork. Related: https://gitlab.freedesktop.org/freedesktop/ci-templates/-/issues/32 Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
-rw-r--r--.gitlab-ci.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 936e8f1..23c3de3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,9 +13,11 @@ stages:
- containers-build
- test
+variables:
+ FDO_UPSTREAM_REPO: wayland/wayland-protocols
+
.debian:
variables:
- FDO_UPSTREAM_REPO: wayland/wayland-protocols
FDO_DISTRIBUTION_VERSION: bullseye
FDO_DISTRIBUTION_PACKAGES: 'build-essential automake autoconf libtool pkg-config libwayland-dev meson'
FDO_DISTRIBUTION_TAG: '2021-03-24.0'