[gegl] CI: temporarily disable minimum babl
- From: Øyvind "pippin" Kolås <ok src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl] CI: temporarily disable minimum babl
- Date: Thu, 1 Jul 2021 03:17:00 +0000 (UTC)
commit 286cfe24b302ebd7422a2aca50ab8811050a1e54
Author: Øyvind Kolås <pippin gimp org>
Date: Thu Jul 1 05:15:35 2021 +0200
CI: temporarily disable minimum babl
The babl we depend on fails to build with the newest meson, which is
fixed in babl master - but babl master depends on a newer babl than
what is in some linux distributions we want to be able to build on.
.gitlab-ci.yml | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e201bd616..09cdd0d18 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,19 +55,19 @@ babl-master:
- ninja -C _build install
- ccache -s
-babl-min:
- extends: .babl-base
- script:
- - grep babl ../meson.build | grep ">=" | grep -o '[0-9]*\.[0-9]*\.[0-9]*' | sed 's/\./_/g' >
.babl_min_version
- - if [ x$(( $(cut .babl_min_version -f 3 -d _) % 2)) = x1 ] ; then touch .use_master ; fi
- - test -e .use_master && git fetch
- - test -e .use_master && git checkout master
- - test -e .use_master || git fetch --no-tags origin "refs/tags/BABL_`cat
.babl_min_version`:refs/tags/MIN_VERSION"
- - test -e .use_master || git checkout MIN_VERSION
- - meson -Dprefix="$BABL_PREFIX" _build
- - ninja -C _build
- - ninja -C _build install
- - ccache -s
+#babl-min:
+# extends: .babl-base
+# script:
+# - grep babl ../meson.build | grep ">=" | grep -o '[0-9]*\.[0-9]*\.[0-9]*' | sed 's/\./_/g' >
.babl_min_version
+# - if [ x$(( $(cut .babl_min_version -f 3 -d _) % 2)) = x1 ] ; then touch .use_master ; fi
+# - test -e .use_master && git fetch
+# - test -e .use_master && git checkout master
+# - test -e .use_master || git fetch --no-tags origin "refs/tags/BABL_`cat
.babl_min_version`:refs/tags/MIN_VERSION"
+# - test -e .use_master || git checkout MIN_VERSION
+# - meson -Dprefix="$BABL_PREFIX" _build
+# - ninja -C _build
+# - ninja -C _build install
+# - ccache -s
.gegl-deps:
@@ -134,11 +134,11 @@ babl-min:
variables:
BUILD_TYPE: "debugoptimized"
-default-min-babl:
- extends: .build-default
- dependencies:
- - babl-min
- needs: ["babl-min"]
+#default-min-babl:
+# extends: .build-default
+# dependencies:
+# - babl-min
+# needs: ["babl-min"]
fullconfig-master-babl:
extends: .build-all
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]