From 856f7ebe2b42f723575a5c805ed7813002762a81 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <creiter@src.gnome.org>
Date: Thu, 23 Aug 2018 21:53:29 +0200
Subject: [PATCH] ci: Add an autotools job

---
 .gitlab-ci.yml           | 27 ++++++++++++++++++++++++++-
 .gitlab-ci/Dockerfile    |  4 ++++
 .gitlab-ci/run-docker.sh |  2 +-
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a3634df87..bed21643a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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:
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 06d3a4ae3..4d7efa3d9 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -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
 
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index 91d3042e7..dc36d43eb 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/glib/master:v6"
+TAG="registry.gitlab.gnome.org/gnome/glib/master:v7"
 
 docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
     --file "Dockerfile" .