X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.cirrus.yml;h=77d74b0811abdc92cb69aa24ab7162b6c2f01bca;hb=3914d75c42f60d71ace4957bd31d3009d9f8ed0c;hp=fd92f24cb7d15d3ebd7b7b1664d913d6c9566b62;hpb=3f9047a62b0c29f8d4088b443c3238e0e9529f16;p=bup.git

diff --git a/.cirrus.yml b/.cirrus.yml
index fd92f24..77d74b0 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,51 +1,8 @@
 
 task:
-  name: debian (py2 check/lint root)
+  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
-    BUP_PYTHON_CONFIG=python2.7-config ./configure --with-pylint=yes
-    make -j6 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/lint root)
-  container:
-    image: debian:buster
+    image: debian:bullseye
     cpu: 4
     memory: 2
   script: |
@@ -56,14 +13,17 @@ task:
     make -j6 check
 
 task:
-  name: debian (py3 long-check)
+  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 .
@@ -71,9 +31,9 @@ task:
       "$(pwd)" | su -l bup
 
 task:
-  name: debian (py3 check)
+  name: debian check
   container:
-    image: debian:buster
+    image: debian:bullseye
     cpu: 4
     memory: 2
   script: |
@@ -86,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
@@ -95,15 +55,19 @@ task:
     set -xe
     dev/prep-for-freebsd-build python3
     dev/system-info
-    BUP_PYTHON_CONFIG=python3.8-config make -j6 check
+    BUP_PYTHON_CONFIG=python3.9-config make -j6 check
 
 task:
-  name: macos (py3 check)
-  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
     dev/system-info
     make -j6 BUP_PYTHON_CONFIG=python3-config LDFLAGS=-L/usr/local/lib check