From 125a378a0bef8d03ba29fb8f7223baf470b06200 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 18 Jan 2022 10:22:15 +0100
Subject: [PATCH] gitlab-ci: ensure buildserver env vars are always set

GitLab CI runs the Docker images in a way that makes it not a login shell.
Files in /etc/profile.d are only sourced automatically in a login shell,
so it needs to happen manually here.
---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aa4be75701..c8258c42e5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -247,7 +247,7 @@ fdroid build:
     - apt-get update
     - apt-get dist-upgrade
 
-    - source /etc/profile.d/bsenv.sh
+    - test -n "$fdroidserver" || source /etc/profile.d/bsenv.sh
 
     # TODO remove sdkmanager install once it is included in the buildserver image
     - git clone --depth=1 --branch=0.5.2 https://gitlab.com/fdroid/sdkmanager.git
@@ -335,6 +335,7 @@ pages:
     - apt-get update
     - apt-get dist-upgrade
 
+    - test -n "$fdroidserver" || source /etc/profile.d/bsenv.sh
     - test -d $fdroidserver || mkdir $fdroidserver
     - git ls-remote https://gitlab.com/fdroid/fdroidserver.git master
     - curl --silent https://gitlab.com/fdroid/fdroidserver/-/archive/master/fdroidserver-master.tar.gz