From 596ebd7acccf9d1e568ce6c324aa514c52796e62 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 17 Feb 2020 17:08:48 +1000
Subject: [PATCH] gitlab CI: add targets to build from each others tarballs

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 .gitlab-ci.yml            | 51 +++++++++++++++++++++++++++++++++++++++++++++--
 .gitlab-ci/gitlab-ci.tmpl | 49 ++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 97 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 23ad784..1ce3e95 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,7 +35,7 @@ stages:
   - VM               # for running the test suite in a VM
   - autotools        # distribution builds with autotools
   - meson            # distribution builds with meson
-  - deploy           # trigger wayland's website generation
+  - tarballs         # tarball builds
   - container_clean  # clean up unused container images
 
 variables:
@@ -749,4 +749,51 @@ fedora:31@no-doxygen-check-valgrind-meson:
 fedora:31@enable-gcov-meson:
   extends: .fedora-custom-build@meson-template
   variables:
-    MESON_ARGS: '-Dcoverity=true'
\ No newline at end of file
+    MESON_ARGS: '-Dcoverity=true'
+
+
+fedora:31@meson-from-tarball:
+  stage: tarballs
+  image: $FEDORA_CONTAINER_IMAGE
+  script:
+    - export INSTALLDIR="$PWD/_inst"
+    - mkdir _build
+    - pushd _build > /dev/null
+    - ../autogen.sh --disable-silent-rules $CONFIGURE_FLAGS
+    - make
+    - make distcheck
+    - popd > /dev/null
+    - mkdir -p _tarball_dir
+    - tar xf _build/libevdev-*.tar.xz -C _tarball_dir
+    - pushd _tarball_dir/libevdev-*/ > /dev/null
+    - meson builddir --prefix="$INSTALLDIR"
+    - ninja -C builddir test
+    - ninja -C builddir install
+    - popd > /dev/null
+    - ls -lR $INSTALLDIR
+  variables:
+    FEDORA_VERSION: 31
+  needs: ['fedora:31@container-prep']
+
+fedora:31@autotools-from-tarball:
+  stage: tarballs
+  image: $FEDORA_CONTAINER_IMAGE
+  script:
+    - export INSTALLDIR="$PWD/_inst"
+    - meson builddir
+    - ninja -C builddir dist
+    - mkdir -p _tarball_dir
+    - tar xf builddir/meson-dist/libevdev-*.xz -C _tarball_dir
+    - pushd _tarball_dir/libevdev-*/ > /dev/null
+    - mkdir _build
+    - pushd _build > /dev/null
+    - ../autogen.sh --disable-silent-rules --prefix="$INSTALLDIR" $CONFIGURE_FLAGS
+    - make
+    - make install
+    - make distcheck
+    - popd > /dev/null
+    - popd > /dev/null
+    - ls -lR $INSTALLDIR
+  variables:
+    FEDORA_VERSION: 31
+  needs: ['fedora:31@container-prep']
\ No newline at end of file
diff --git a/.gitlab-ci/gitlab-ci.tmpl b/.gitlab-ci/gitlab-ci.tmpl
index 70dfc96..2b39601 100644
--- a/.gitlab-ci/gitlab-ci.tmpl
+++ b/.gitlab-ci/gitlab-ci.tmpl
@@ -35,7 +35,7 @@ stages:
   - VM               # for running the test suite in a VM
   - autotools        # distribution builds with autotools
   - meson            # distribution builds with meson
-  - deploy           # trigger wayland's website generation
+  - tarballs         # tarball builds
   - container_clean  # clean up unused container images
 
 variables:
@@ -422,3 +422,50 @@ fedora:31@enable-gcov-meson:
   extends: .fedora-custom-build@meson-template
   variables:
     MESON_ARGS: '-Dcoverity=true'
+
+
+fedora:31@meson-from-tarball:
+  stage: tarballs
+  image: $FEDORA_CONTAINER_IMAGE
+  script:
+    - export INSTALLDIR="$PWD/_inst"
+    - mkdir _build
+    - pushd _build > /dev/null
+    - ../autogen.sh --disable-silent-rules $CONFIGURE_FLAGS
+    - make
+    - make distcheck
+    - popd > /dev/null
+    - mkdir -p _tarball_dir
+    - tar xf _build/libevdev-*.tar.xz -C _tarball_dir
+    - pushd _tarball_dir/libevdev-*/ > /dev/null
+    - meson builddir --prefix="$INSTALLDIR"
+    - ninja -C builddir test
+    - ninja -C builddir install
+    - popd > /dev/null
+    - ls -lR $INSTALLDIR
+  variables:
+    FEDORA_VERSION: 31
+  needs: ['fedora:31@container-prep']
+
+fedora:31@autotools-from-tarball:
+  stage: tarballs
+  image: $FEDORA_CONTAINER_IMAGE
+  script:
+    - export INSTALLDIR="$PWD/_inst"
+    - meson builddir
+    - ninja -C builddir dist
+    - mkdir -p _tarball_dir
+    - tar xf builddir/meson-dist/libevdev-*.xz -C _tarball_dir
+    - pushd _tarball_dir/libevdev-*/ > /dev/null
+    - mkdir _build
+    - pushd _build > /dev/null
+    - ../autogen.sh --disable-silent-rules --prefix="$INSTALLDIR" $CONFIGURE_FLAGS
+    - make
+    - make install
+    - make distcheck
+    - popd > /dev/null
+    - popd > /dev/null
+    - ls -lR $INSTALLDIR
+  variables:
+    FEDORA_VERSION: 31
+  needs: ['fedora:31@container-prep']
-- 
2.7.4