From: Ondřej Surý <ondrej@sury.org>
Date: Tue, 18 Dec 2018 14:09:24 +0000 (+0100)
Subject: Add some combinations of --with-python=<path>/--with-python/--without-python to GitLab CI
X-Git-Tag: v9.12.4rc1~52^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=33873abe16f8899d1383baa0bd9e365e23cfa18f;p=thirdparty%2Fbind9.git

Add some combinations of --with-python=<path>/--with-python/--without-python to GitLab CI

(cherry picked from commit 99cf0faec0fb68165bae0aefef4ab25a35d1c465)
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f74762e4058..e4afba7777a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -271,6 +271,7 @@ clang:stretch:amd64:build:
   variables:
     CC: clang
     CFLAGS: "-Wall -Wextra -Wenum-conversion -O2 -g"
+    EXTRA_CONFIGURE: "--with-python=python3"
   <<: *debian_stretch_amd64_image
   <<: *build_job
 
@@ -278,7 +279,7 @@ jessie:amd64:build:
   variables:
     CC: gcc
     CFLAGS: "-Wall -Wextra -O2 -g"
-    EXTRA_CONFIGURE: --without-cmocka
+    EXTRA_CONFIGURE: "--without-cmocka --with-python"
   <<: *debian_jessie_amd64_image
   <<: *build_job
 
@@ -314,6 +315,7 @@ clang:stretch:i386:build:
   variables:
     CC: clang
     CFLAGS: "-Wall -Wextra -Wenum-conversion -O2 -g"
+    EXTRA_CONFIGURE: "--with-python=python2"
   <<: *debian_stretch_i386_image
   <<: *build_job
 
@@ -321,7 +323,7 @@ sid:i386:build:
   variables:
     CC: gcc
     CFLAGS: "-Wall -Wextra -O2 -g"
-    EXTRA_CONFIGURE: "--with-libidn2"
+    EXTRA_CONFIGURE: "--with-libidn2 --without-python"
   <<: *debian_sid_i386_image
   <<: *build_job