X-Git-Url: https://arthur.barton.de/gitweb/?p=bup.git;a=blobdiff_plain;f=.cirrus.yml;h=17421458cd7f9e92144e329582b7ee6256ac8b6f;hp=4148b3b3aa132a2f899141dab3a5bf9f333147b7;hb=HEAD;hpb=313876c4071f5dd767a736b2c6f0741d4fe17ce4

diff --git a/.cirrus.yml b/.cirrus.yml
index 4148b3b..77d74b0 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,74 +1,39 @@
 
 task:
-  name: debian (py2)
+  name: debian check/lint 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 (long py2)
-  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 (root py2)
-  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)
-  container:
-    image: debian:buster
+    image: debian:bullseye
     cpu: 4
     memory: 2
   script: |
     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 (long py3)
+  name: debian long-check
   container:
-    image: debian:buster
+    image: debian:bullseye
     cpu: 4
     memory: 2
   script: |
     set -xe
     dev/prep-for-debianish-build python3
+    DEBIAN_FRONTEND=noninteractive apt-get -y 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 .
-    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 (root py3)
+  name: debian check
   container:
-    image: debian:buster
+    image: debian:bullseye
     cpu: 4
     memory: 2
   script: |
@@ -77,28 +42,32 @@ 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)
+  name: freebsd check
   freebsd_instance:
-    image: freebsd-12-1-release-amd64
+    image: freebsd-12-2-release-amd64
     cpu: 4
     memory: 4
   script: |
     set -xe
     dev/prep-for-freebsd-build python3
     dev/system-info
-    gmake -j6 PYTHON=python3.7 check
+    BUP_PYTHON_CONFIG=python3.9-config make -j6 check
 
 task:
-  name: macos (py3)
-  osx_instance:
-    image: catalina-base
+  name: macos check
+  macos_instance:
+    # https://cirrus-ci.org/guide/macOS/
+    image: ghcr.io/cirruslabs/macos-monterey-base:latest
   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
-    export PYTHON=python3
     dev/system-info
-    make -j4 PYTHON=python3 check
+    make -j6 BUP_PYTHON_CONFIG=python3-config LDFLAGS=-L/usr/local/lib check