diff options
| -rw-r--r-- | .gitlab-ci.yml | 26 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile | 4 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker.sh | 2 |
3 files changed, 26 insertions, 6 deletions
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 diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index c232b6c5..6d63ef21 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -1,6 +1,8 @@ FROM fedora:28 RUN dnf -y install \ + autoconf \ + automake \ bison \ cairo-devel \ cairo-gobject-devel \ @@ -20,6 +22,7 @@ RUN dnf -y install \ glibc-headers \ gtk-doc \ itstool \ + libtool \ libXft-devel \ libXfixes-devel \ libattr-devel \ @@ -28,6 +31,7 @@ RUN dnf -y install \ libselinux-devel \ libxml2-devel \ libxslt \ + make \ mesa-libGL-devel \ ninja-build \ pcre-devel \ diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh index 77eff633..de3d0b42 100755 --- a/.gitlab-ci/run-docker.sh +++ b/.gitlab-ci/run-docker.sh @@ -2,7 +2,7 @@ set -e -TAG="registry.gitlab.gnome.org/gnome/gobject-introspection:v1" +TAG="lazka/gobject-introspection:v1" sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \ --file "Dockerfile" . |