Merge branch 'ci-autotools-v2' into 'master'

ci: Add an autotools job

See merge request GNOME/glib!267
This commit is contained in:
Philip Withnall 2018-08-25 12:33:55 +00:00
commit f9e28a9b9a
3 changed files with 31 additions and 2 deletions

View File

@ -1,4 +1,4 @@
image: registry.gitlab.gnome.org/gnome/glib/master:v6
image: registry.gitlab.gnome.org/gnome/glib/master:v7
stages:
- build
@ -43,6 +43,31 @@ fedora-x86_64:
paths:
- "_build/meson-logs"
fedora-autotools-x86_64:
stage: build
except:
- tags
variables:
CFLAGS: "-Werror"
V: "1"
MAKEFLAGS: "-j8"
script:
- mkdir _build
- cd _build
- ../autogen.sh --enable-always-build-tests --enable-systemtap --enable-dtrace
- make
- make check
artifacts:
name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
when: always
paths:
- "_build/*.log"
- "_build/*/*.log"
- "_build/*/*/*.log"
- "_build/*/*/*/*.log"
- "_build/*/*/*/*/*.log"
- "_build/*/*/*/*/*/*.log"
cross-android_api21_arm64:
<<: *cross-template
script:

View File

@ -1,6 +1,8 @@
FROM fedora:27
RUN dnf -y install \
autoconf \
automake \
desktop-file-utils \
elfutils-libelf-devel \
findutils \
@ -18,6 +20,7 @@ RUN dnf -y install \
libffi-devel \
libmount-devel \
libselinux-devel \
libtool \
libxslt \
make \
mingw64-gcc \
@ -34,6 +37,7 @@ RUN dnf -y install \
systemtap-sdt-devel \
unzip \
wget \
xz \
zlib-devel \
&& dnf clean all

View File

@ -2,7 +2,7 @@
set -e
TAG="registry.gitlab.gnome.org/gnome/glib/master:v6"
TAG="registry.gitlab.gnome.org/gnome/glib/master:v7"
docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
--file "Dockerfile" .