cirrus: adjust for new python-config based builds

Adjust to accommodate the switch from PYTHON to BUP_PYTHON_CONFIG
cf. 4d9dd65141326b0f3ffa1658a0535348940ed017

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/.cirrus.yml b/.cirrus.yml
index 879c2bf737b2a8b02963f12851ffa8610330ddac..4cb4a4b8d56435e4669bc629493c1cc4709071b1 100644 (file)
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -9,7 +9,7 @@ task:
     set -xe
     dev/prep-for-debianish-build python2
     dev/system-info
-    eatmydata make -j6 PYTHON=python2 check
+    make -j6 BUP_PYTHON_CONFIG=python2.7-config check
 
 task:
   name: debian (py2 long-check)
@@ -23,7 +23,8 @@ task:
     dev/system-info
     adduser --disabled-password --gecos '' bup
     chown -R bup:bup .
-    su -l bup -c "eatmydata make -j6 -C '$(pwd)' PYTHON=python2 long-check"
+    printf "make -j6 -C %q BUP_PYTHON_CONFIG=python2.7-config long-check" \
+      "$(pwd)" | su -l bup
 
 task:
   name: debian (py2 check)
@@ -37,7 +38,8 @@ task:
     dev/system-info
     adduser --disabled-password --gecos '' bup
     chown -R bup:bup .
-    su -l bup -c "eatmydata make -j6 -C '$(pwd)' PYTHON=python2 check"
+    printf "make -j6 -C %q BUP_PYTHON_CONFIG=python2.7-config check" \
+      "$(pwd)" | su -l bup
 
 task:
   name: debian (py3 check root)
@@ -49,7 +51,7 @@ task:
     set -xe
     dev/prep-for-debianish-build python3
     dev/system-info
-    eatmydata make -j6 PYTHON=python3 check
+    make -j6 BUP_PYTHON_CONFIG=python3-config check
 
 task:
   name: debian (py3 long-check)
@@ -63,7 +65,8 @@ task:
     dev/system-info
     adduser --disabled-password --gecos '' bup
     chown -R bup:bup .
-    su -l bup -c "eatmydata make -j6 -C '$(pwd)' PYTHON=python3 long-check"
+    printf "make -j6 -C %q BUP_PYTHON_CONFIG=python3-config long-check" \
+      "$(pwd)" | su -l bup
 
 task:
   name: debian (py3 check)
@@ -77,7 +80,8 @@ task:
     dev/system-info
     adduser --disabled-password --gecos '' bup
     chown -R bup:bup .
-    su -l bup -c "eatmydata make -j6 -C '$(pwd)' PYTHON=python3 check"
+    printf "make -j6 -C %q BUP_PYTHON_CONFIG=python3-config check" \
+      "$(pwd)" | su -l bup
 
 task:
   name: freebsd (py3 check)
@@ -89,7 +93,7 @@ task:
     set -xe
     dev/prep-for-freebsd-build python3
     dev/system-info
-    gmake -j6 PYTHON=python3.7 check
+    BUP_PYTHON_CONFIG=python3.8-config make -j6 check
 
 task:
   name: macos (py3 check)
@@ -99,6 +103,5 @@ task:
     set -xe
     dev/prep-for-macos-build python3
     export PKG_CONFIG_PATH=/usr/local/opt/readline/lib/pkgconfig
-    export PYTHON=python3
     dev/system-info
-    make -j4 PYTHON=python3 check
+    make -j6 BUP_PYTHON_CONFIG=python3-config LDFLAGS=-L/usr/local/lib check