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

diff --git a/.cirrus.yml b/.cirrus.yml
index c7bdd82..77d74b0 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -2,7 +2,7 @@
 task:
   name: debian check/lint root
   container:
-    image: debian:buster
+    image: debian:bullseye
     cpu: 4
     memory: 2
   script: |
@@ -15,12 +15,15 @@ task:
 task:
   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 .
@@ -30,7 +33,7 @@ task:
 task:
   name: debian check
   container:
-    image: debian:buster
+    image: debian:bullseye
     cpu: 4
     memory: 2
   script: |
@@ -52,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 check
-  osx_instance:
-    image: catalina-base
+  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