X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.cirrus.yml;h=639cc2b18fd816df33ba16439dd311e14ed83b2f;hb=f5cf01c61b498d00a46f158cb75fa2ddb38b7a43;hp=4cb4a4b8d56435e4669bc629493c1cc4709071b1;hpb=05a72a1f4c61bd82717d09112faf32c9df174eec;p=bup.git

diff --git a/.cirrus.yml b/.cirrus.yml
index 4cb4a4b..639cc2b 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,48 +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
-    make -j6 BUP_PYTHON_CONFIG=python2.7-config 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 .
-    printf "make -j6 -C %q BUP_PYTHON_CONFIG=python2.7-config long-check" \
-      "$(pwd)" | su -l bup
-
-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 .
-    printf "make -j6 -C %q BUP_PYTHON_CONFIG=python2.7-config check" \
-      "$(pwd)" | su -l bup
-
-task:
-  name: debian (py3 check root)
+  name: debian check/lint root
   container:
     image: debian:buster
     cpu: 4
@@ -51,10 +9,11 @@ task:
     set -xe
     dev/prep-for-debianish-build python3
     dev/system-info
-    make -j6 BUP_PYTHON_CONFIG=python3-config 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
@@ -62,6 +21,9 @@ task:
   script: |
     set -xe
     dev/prep-for-debianish-build python3
+    apt install bup
+    export BUP_TEST_OTHER_BUP="$(command -v bup)"
+    "$BUP_TEST_OTHER_BUP" version
     dev/system-info
     adduser --disabled-password --gecos '' bup
     chown -R bup:bup .
@@ -69,7 +31,7 @@ task:
       "$(pwd)" | su -l bup
 
 task:
-  name: debian (py3 check)
+  name: debian check
   container:
     image: debian:buster
     cpu: 4
@@ -84,7 +46,7 @@ task:
       "$(pwd)" | su -l bup
 
 task:
-  name: freebsd (py3 check)
+  name: freebsd check
   freebsd_instance:
     image: freebsd-12-2-release-amd64
     cpu: 4
@@ -96,12 +58,15 @@ task:
     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
+    brew install bup
+    export BUP_TEST_OTHER_BUP="$(command -v bup)"
+    "$BUP_TEST_OTHER_BUP" version
     export PKG_CONFIG_PATH=/usr/local/opt/readline/lib/pkgconfig
     dev/system-info
     make -j6 BUP_PYTHON_CONFIG=python3-config LDFLAGS=-L/usr/local/lib check