[gimp/wip/nielsdg/fix-ci] ci: Drop babl autotools build
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/wip/nielsdg/fix-ci] ci: Drop babl autotools build
- Date: Tue, 30 Jul 2019 06:15:18 +0000 (UTC)
commit 5137dd2dd49b89f9659b120c01d6eb9ed28f10d9
Author: Niels De Graef <nielsdegraef gmail com>
Date: Tue Jul 30 08:13:41 2019 +0200
ci: Drop babl autotools build
babl dropped support for building with autotools, so don't do it in the
CI anymore, or we'll just have failing pipelines.
Based on gegl commit 24513be2.
.gitlab-ci.yml | 53 ++++-------------------------------------------------
1 file changed, 4 insertions(+), 49 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5cdaecd077..4fb90eab28 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,35 +30,14 @@ image: archlinux/base:latest
- cd _babl
- mkdir _build
-babl-git-autotools:
+babl-git-meson:
extends: .babl-base
variables:
GIT_STRATEGY: none
script:
- - cd _build
- - ../autogen.sh --prefix="$INSTALL_PREFIX"
- - make -j `nproc`
- - make install
-
-# babl-git-meson:
-# extends: .babl-base
-# variables:
-# GIT_STRATEGY: none
-# script:
-# - meson -Dprefix="$INSTALL_PREFIX" _build
-# - ninja -C _build
-# - ninja -C _build install
-
-# babl-min-autotools:
-# extends: .babl-base
-# script:
-# - grep babl_required_version ../configure.ac | grep -o '[0-9]*\.[0-9]*\.[0-9]*' | sed 's/\./_/g' >
.babl_min_version
-# - git fetch --no-tags origin "refs/tags/BABL_`cat .babl_min_version`:refs/tags/MIN_VERSION"
-# - git checkout MIN_VERSION
-# - cd _build
-# - ../autogen.sh --prefix="$INSTALL_PREFIX"
-# - make
-# - make install
+ - meson -Dprefix="$INSTALL_PREFIX" _build
+ - ninja -C _build
+ - ninja -C _build install
# babl-min-meson:
# extends: .babl-base
@@ -188,48 +167,24 @@ gegl-git-autotools:
variables:
CONFIG_OPTIONS: "--enable-debug"
-# build-default-git-autotools:
-# extends: .build-default
-# dependencies:
-# - babl-git-autotools
-# - gegl-git-autotools
-
# build-default-git-meson:
# extends: .build-default
# dependencies:
# - babl-git-meson
# - gegl-git-meson
-# build-default-min-autotools:
-# extends: .build-default
-# dependencies:
-# - babl-min-autotools
-# - gegl-min-autotools
-
# build-default-min-meson:
# extends: .build-default
# dependencies:
# - babl-min-meson
# - gegl-min-meson
-build-all-git-autotools:
- extends: .build-all
- dependencies:
- - babl-git-autotools
- - gegl-git-autotools
-
# build-all-git-meson:
# extends: .build-all
# dependencies:
# - babl-git-meson
# - gegl-git-meson
-# build-all-min-autotools:
-# extends: .build-all
-# dependencies:
-# - babl-min-autotools
-# - gegl-min-autotools
-
# build-all-min-meson:
# extends: .build-all
# dependencies:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]