cirrus: update freebsd python, debian to bullseye, macos to monterey

Move freebsd python to 3.9, and update the debian and macos images.
Don't install rsnapshot on debian since it's not in bullseye, and the
one test doesn't actually rely on it.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/.cirrus.yml b/.cirrus.yml
index 46cc25523419bc13d4344899138713b157b9570e..77d74b0811abdc92cb69aa24ab7162b6c2f01bca 100644 (file)
--- 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,7 +15,7 @@ task:
 task:
   name: debian long-check
   container:
-    image: debian:buster
+    image: debian:bullseye
     cpu: 4
     memory: 2
   script: |
@@ -33,7 +33,7 @@ task:
 task:
   name: debian check
   container:
-    image: debian:buster
+    image: debian:bullseye
     cpu: 4
     memory: 2
   script: |
@@ -55,12 +55,13 @@ 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

diff --git a/dev/prep-for-debianish-build b/dev/prep-for-debianish-build
index 56ab0dbd3b2f4ae0bce46263d6ab88b01068bc1a..ef478ffb1e4f96b42c330f0f1552acae7c50e549 100755 (executable)
--- a/dev/prep-for-debianish-build
+++ b/dev/prep-for-debianish-build
@@ -11,7 +11,7 @@ export DEBIAN_FRONTEND=noninteractive
 apt-get update
 
 common_debs='gcc make linux-libc-dev git rsync eatmydata acl attr par2'
-common_debs="$common_debs duplicity rdiff-backup rsnapshot dosfstools kmod"
+common_debs="$common_debs duplicity rdiff-backup dosfstools kmod"
 common_debs="$common_debs pkg-config libreadline-dev libacl1-dev"
 
 pyver="${1:-python3}"

diff --git a/dev/prep-for-freebsd-build b/dev/prep-for-freebsd-build
index 556b72deeb4f31a09eafe240b203cb3cc280a60c..0c6b047c5b60bf534f9f1f4d55133ec9502456df 100755 (executable)
--- a/dev/prep-for-freebsd-build
+++ b/dev/prep-for-freebsd-build
@@ -21,7 +21,7 @@ pkgs="$pkgs rsnapshot"
 
 case "$pyver" in
     python3)
-        pkgs="$pkgs python38 py38-tornado py38-pytest py38-pytest-xdist"
+        pkgs="$pkgs python39 py39-tornado py39-pytest py39-pytest-xdist"
         pkg install $pkgs
         ;;
     *)