PolicyKit: Branch 'master' - 3 commits

[GitLab Mirror]

 .gitlab-ci.yml |   24 ++++++++++++++++++++++++
 Makefile.am    |    2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

New commits:
commit 025f9a6ba374c77c67f104ed5a4c04a057cc8084
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jun 3 17:45:48 2021 +0100

    build: Build documentation from source during distcheck
    
    This verifies that we can.
    
    Signed-off-by: Simon McVittie <smcv at debian.org>

diff --git a/Makefile.am b/Makefile.am
index dc0768f..1648bcc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,8 +19,8 @@ EXTRA_DIST = 			\
 # xsltproc barfs on 'make distcheck'; disable for now
 DISTCHECK_CONFIGURE_FLAGS=							\
 	--disable-man-pages 							\
-	--disable-gtk-doc 							\
 	--disable-introspection							\
+	--enable-gtk-doc 							\
 	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)	\
 	$(NULL)
 
commit 4e7b62b0470db29d572190622e0594d25f802a9b
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jun 3 17:45:18 2021 +0100

    CI: Exercise Autotools distcheck
    
    Signed-off-by: Simon McVittie <smcv at debian.org>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b6b3fc5..8ac3e9f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,6 +67,7 @@ build_autotools:
     - make
     - make check
     - make install
+    - make distcheck
   artifacts:
     name: 'test logs'
     when: 'always'
commit 0f8f091ffe7f949fd0397a4cf65db32f9b5b2ff9
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jun 3 17:44:43 2021 +0100

    CI: Reinstate Autotools build
    
    Until we are ready to remove Autotools altogether (!53) we should
    make sure it works.
    
    Signed-off-by: Simon McVittie <smcv at debian.org>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index acebd43..b6b3fc5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,3 +49,26 @@ build_stable:
     paths:
       - 'builddir/meson-logs/*.txt'
 
+build_autotools:
+  before_script:
+    - dnf upgrade -y --nogpgcheck fedora-release fedora-repos*
+    - dnf update -y && dnf install -y $DEPENDENCIES
+
+  script:
+    - mkdir _build
+    - cd _build
+    - CPPFLAGS='-D_FORTIFY_SOURCE=2' ../autogen.sh
+      --disable-dependency-tracking
+      --enable-ansi
+      --enable-man-pages
+      --enable-test
+      --enable-libsystemd-login=yes
+      --enable-libelogind=no
+    - make
+    - make check
+    - make install
+  artifacts:
+    name: 'test logs'
+    when: 'always'
+    paths:
+      - '_build/test/*/*.log'