fontconfig: Branch 'main' - 3 commits

[GitLab Mirror]

 .gitlab-ci/build.sh |   22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

New commits:
commit 8e8e3851b594f056b96564cdcea8d857b9d72a75
Merge: a0450ee cf8ba7e
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Jun 25 03:11:21 2025 +0000

    Merge branch 'ci-subproject-fix' into 'main'
    
    ci: fix pipeline fail of subproject build on forked project
    
    See merge request fontconfig/fontconfig!440

commit cf8ba7efde26cfcd52f7a5c5a20b84f2db13f0f2
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Jun 25 11:44:48 2025 +0900

    ci: add some usage text to build script

diff --git a/.gitlab-ci/build.sh b/.gitlab-ci/build.sh
index 3b2d63f..22cc4e0 100755
--- a/.gitlab-ci/build.sh
+++ b/.gitlab-ci/build.sh
@@ -60,7 +60,23 @@ do
         't') type=$OPTARG ;;
         'X') backend=$OPTARG ;;
         'h')
-            echo "Usage: $0 [-a ARCH] [-c] [-C] [-e OPT] [-d OPT] [-h] [-I] [-N] [-s BUILDSYS] [-t BUILDTYPE] [-X XMLBACKEND]"
+            set +x
+            echo "Usage: $0 [-a ARCH] [-c] [-C] [-e OPT] [-d OPT] [-h] [-I] [-N] [-O N] [-s BUILDSYS] [-S] [-t BUILDTYPE] [-X XMLBACKEND]"
+            echo "Options:"
+            echo "  -a ARCH        Use ARCH for cross-compile. Depends on BUILDSYS"
+            echo "  -c             Run distcheck"
+            echo "  -C             Do not run unit tests"
+            echo "  -e OPT         Enable OPT feature to build"
+            echo "  -d OPT         Disable OPT feature to build"
+            echo "  -I             Run install"
+            echo "  -N             Do not clean build directory"
+            echo "  -O N           Optimization level to build"
+            echo "  -s BUILDSYS    Use BUILDSYS to build (default: $buildsys)"
+            echo "  -S             Run sub-project build. Take effect on meson only"
+            echo "  -t BUILDTYPE   shared build or static build (default: $type)"
+            echo "  -X XMLBACKEND  Use XMLBACKEND for xml parser library"
+            echo ""
+            echo "FC_BUILD_PLATFORM: Set a platform for cross-compiling, mingw or android"
             exit 1
             ;;
     esac
commit 551283efd1c532ac7c1aad3fc810a2a7df7cbac0
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Jun 25 11:23:50 2025 +0900

    ci: fix pipeline fail of subproject build on forked project

diff --git a/.gitlab-ci/build.sh b/.gitlab-ci/build.sh
index 4c1e2f5..3b2d63f 100755
--- a/.gitlab-ci/build.sh
+++ b/.gitlab-ci/build.sh
@@ -30,7 +30,7 @@ export MAKE=${MAKE:-make}
 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_MERGE_REQUEST_PROJECT_URL=${CI_MERGE_REQUEST_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
@@ -178,7 +178,7 @@ elif [ x"$buildsys" == "xmeson" ]; then
         git clone https://gitlab.freedesktop.org/fontconfig/fc-ci-meson-subproject.git
         cd fc-ci-meson-subproject
         pushd subprojects
-        git clone ${CI_PROJECT_URL}.git
+        git clone ${CI_MERGE_REQUEST_PROJECT_URL}.git
         if [ -n "$CI_MERGE_REQUEST_IID" ]; then
             pushd fontconfig
             git fetch origin merge-requests/$CI_MERGE_REQUEST_IID/head:$CI_COMMIT_REF_NAME