From 42da22947b0808d73a63c7f8f6b16efe7944f729 Mon Sep 17 00:00:00 2001 From: Jonas Ådahl Date: Wed, 31 Mar 2021 08:39:03 +0200 Subject: ci: Make the FDO_UPSTREAM_REPO variable global MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to '.gitlab-ci.yml') 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' -- cgit v1.2.3