diff options
| author | Akira TAGOH <akira@tagoh.org> | 2022-04-11 18:09:30 +0900 |
|---|---|---|
| committer | Akira TAGOH <akira@tagoh.org> | 2022-04-11 21:18:01 +0900 |
| commit | cf38c54a9315b19a71cb06d96b48585b6a27505d (patch) | |
| tree | e0df82eadb63d1e838ca8f8156b9ea5bb47a3bcb | |
| parent | 911b19f19f1334d51c452756f9ce222c1101097b (diff) | |
| download | fontconfig-cf38c54a9315b19a71cb06d96b48585b6a27505d.tar.gz | |
Use the latest stable release image for CI for mingw
CI sometimes fails. we want to avoid environment specific issues on our
CI.
| -rw-r--r-- | .gitlab-ci.yml | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1017fa6..a6d4e90 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,8 +6,7 @@ stages: before_script: - dnf -y upgrade --disablerepo=rawhide-modular --nogpgcheck fedora-repos fedora-repos-rawhide - dnf -y upgrade --disablerepo=rawhide-modular - - dnf -y install --disablerepo=rawhide-modular --allowerasing --skip-broken @buildsys-build autoconf automake libtool gettext gettext-devel gperf expat-devel freetype-devel json-c-devel git docbook-utils docbook-utils-pdf bubblewrap - - dnf -y install --disablerepo=rawhide-modular --allowerasing --skip-broken mingw64-gettext mingw64-freetype mingw64-expat wine + - dnf -y install --disablerepo=rawhide-modular --allowerasing --skip-broken @buildsys-build autoconf automake libtool gettext gettext-devel gperf expat-devel libxml2-devel freetype-devel json-c-devel git docbook-utils docbook-utils-pdf bubblewrap - dnf -y install --disablerepo=rawhide-modular --allowerasing --skip-broken ninja-build wget python3-pip - pip install meson @@ -20,7 +19,7 @@ shared-build: - export MAKEFLAGS="-j4" - mkdir "$BUILDDIR" "$PREFIX" - cd "$BUILDDIR" - - ../autogen.sh --prefix="$PREFIX" --enable-shared --disable-static + - ../autogen.sh --prefix="$PREFIX" --enable-shared --disable-static --enable-libxml2 - make - make check - make install @@ -48,7 +47,7 @@ static-build: - export MAKEFLAGS="-j4" - mkdir "$BUILDDIR" - cd "$BUILDDIR" - - ../autogen.sh --prefix="$PREFIX" --disable-shared --enable-static + - ../autogen.sh --prefix="$PREFIX" --disable-shared --enable-static --enable-libxml2 - make - make check artifacts: @@ -60,7 +59,12 @@ static-build: - build-*/test/*.trs - build-*/test/out* mingw-build: + image: fedora:35 stage: build + before_script: + - dnf -y upgrade --disablerepo=rawhide-modular + - dnf -y install --disablerepo=rawhide-modular --allowerasing --skip-broken @buildsys-build autoconf automake libtool gettext gettext-devel gperf libxml2-devel freetype-devel json-c-devel git docbook-utils docbook-utils-pdf wget + - dnf -y install --disablerepo=rawhide-modular --allowerasing --skip-broken mingw64-gettext mingw64-freetype mingw64-libxml2 wine script: - export BUILD_ID="fontconfig-$CI_JOB_NAME_$CI_COMMIT_SHA-$CI_JOB_ID" - export PREFIX="$(pwd)/prefix-$BUILD_ID" @@ -69,7 +73,7 @@ mingw-build: - mkdir "$BUILDDIR" - cd "$BUILDDIR" - eval `rpm --eval %{mingw64_env}` - - ../autogen.sh --prefix="$PREFIX" --host=x86_64-mingw32 --disable-shared --enable-static + - ../autogen.sh --prefix="$PREFIX" --host=x86_64-mingw32 --disable-shared --enable-static --enable-libxml2 - make - make check artifacts: |