X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.cirrus.yml;h=c7bdd82db3653662e6e9e6ac52dbe6377a1f2c4d;hb=a995eea8bd57041cb373f7041da373897a2ed597;hp=879c2bf737b2a8b02963f12851ffa8610330ddac;hpb=9f1836950d26280986a427b87cb41cc281f5c23d;p=bup.git

diff --git a/.cirrus.yml b/.cirrus.yml
index 879c2bf..c7bdd82 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,46 +1,6 @@
 
 task:
-  name: debian (py2 check root)
-  container:
-    image: debian:buster
-    cpu: 4
-    memory: 2
-  script: |
-    set -xe
-    dev/prep-for-debianish-build python2
-    dev/system-info
-    eatmydata make -j6 PYTHON=python2 check
-
-task:
-  name: debian (py2 long-check)
-  container:
-    image: debian:buster
-    cpu: 4
-    memory: 2
-  script: |
-    set -xe
-    dev/prep-for-debianish-build python2
-    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"
-
-task:
-  name: debian (py2 check)
-  container:
-    image: debian:buster
-    cpu: 4
-    memory: 2
-  script: |
-    set -xe
-    dev/prep-for-debianish-build python2
-    dev/system-info
-    adduser --disabled-password --gecos '' bup
-    chown -R bup:bup .
-    su -l bup -c "eatmydata make -j6 -C '$(pwd)' PYTHON=python2 check"
-
-task:
-  name: debian (py3 check root)
+  name: debian check/lint root
   container:
     image: debian:buster
     cpu: 4
@@ -49,10 +9,11 @@ task:
     set -xe
     dev/prep-for-debianish-build python3
     dev/system-info
-    eatmydata make -j6 PYTHON=python3 check
+    BUP_PYTHON_CONFIG=python3-config ./configure --with-pylint=yes
+    make -j6 check
 
 task:
-  name: debian (py3 long-check)
+  name: debian long-check
   container:
     image: debian:buster
     cpu: 4
@@ -63,10 +24,11 @@ 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)
+  name: debian check
   container:
     image: debian:buster
     cpu: 4
@@ -77,10 +39,11 @@ 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)
+  name: freebsd check
   freebsd_instance:
     image: freebsd-12-2-release-amd64
     cpu: 4
@@ -89,16 +52,15 @@ 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)
+  name: macos check
   osx_instance:
     image: catalina-base
   script: |
     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