From dee88f3188ca7d2984e8f7e501a90ca8238cb1aa Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 22 Jul 2018 12:07:32 +0200 Subject: ci: add an autotools job Switch to docker hub for now as the gitlab registry is broken. Disable the glib version check in configure.ac because we don't strictly need it for testing. --- .gitlab-ci.yml | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 457b8921..71623510 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,13 +1,14 @@ stages: - build +image: lazka/gobject-introspection:v1 + cache: paths: - _ccache/ -fedora-x86_64-python3: +fedora-x86_64-meson-python3: stage: build - image: registry.gitlab.gnome.org/gnome/gobject-introspection:v1 variables: CCACHE_BASEDIR: "${CI_PROJECT_DIR}" CCACHE_DIR: "${CI_PROJECT_DIR}/_ccache" @@ -24,9 +25,8 @@ fedora-x86_64-python3: paths: - "${CI_PROJECT_DIR}/_build/meson-logs" -fedora-x86_64-python2: +fedora-x86_64-meson-python2: stage: build - image: registry.gitlab.gnome.org/gnome/gobject-introspection:v1 variables: CCACHE_BASEDIR: "${CI_PROJECT_DIR}" CCACHE_DIR: "${CI_PROJECT_DIR}/_ccache" @@ -43,7 +43,23 @@ fedora-x86_64-python2: paths: - "${CI_PROJECT_DIR}/_build/meson-logs" -msys2-mingw32: +fedora-x86_64-autotools-python3: + stage: build + variables: + CCACHE_BASEDIR: "${CI_PROJECT_DIR}" + CCACHE_DIR: "${CI_PROJECT_DIR}/_ccache" + script: + - sed -i 's|\[glib-2\.0 >= [0-9.]*\]|[glib-2.0 >= 1.0]|' configure.ac + - ./autogen.sh --with-python=python3 + - make -j4 + - make check + artifacts: + when: on_failure + name: "gi-_${CI_COMMIT_REF_NAME}" + paths: + - "${CI_PROJECT_DIR}/_build/meson-logs" + +msys2-mingw32-python3: stage: build tags: - win32 -- cgit v1.2.1