.gitlab-ci/build.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 3897e1f1939b8b7c4587bdf9ee217d8114f2a91e
Merge: 16f8c8a 9568287
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Tue Apr 22 17:43:36 2025 +0000
Merge branch 'ci-subproject-fix' into 'main'
ci: Correct reference to not trigger fetching a branch for main
See merge request fontconfig/fontconfig!390
commit 956828796c63cf6c14e2f187bd1d93015502adba
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Wed Apr 23 01:57:14 2025 +0900
ci: Correct reference to not trigger fetching a branch for main
diff --git a/.gitlab-ci/build.sh b/.gitlab-ci/build.sh
index dfadf24..54ec7aa 100755
--- a/.gitlab-ci/build.sh
+++ b/.gitlab-ci/build.sh
@@ -30,6 +30,7 @@ export BUILD_ID=${BUILD_ID:-fontconfig-$$}
export PREFIX=${PREFIX:-$MyPWD/prefix}
export BUILDDIR=${BUILDDIR:-$MyPWD/build}
export CI_PROJECT_URL=${CI_PROJECT_URL:-https://gitlab.freedesktop.org/fontconfig/fontconfig}
+export CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME:-main}
if [ "x$FC_DISTRO_NAME" = "x" ]; then
. /etc/os-release || :
@@ -176,7 +177,7 @@ elif [ x"$buildsys" == "xmeson" ]; then
cd fc-ci-meson-subproject
pushd subprojects
git clone ${CI_PROJECT_URL}.git
- if [ "x$CI_COMMIT_REF_NAME" != "x" ]; then
+ if [ -n "$CI_MERGE_REQUEST_IID" ]; then
pushd fontconfig
git fetch origin merge-requests/$CI_MERGE_REQUEST_IID/head:$CI_COMMIT_REF_NAME
git switch $CI_COMMIT_REF_NAME
