From 12a622186da185a408305d58d9350dc341da2794 Mon Sep 17 00:00:00 2001
From: Rob Browning <rlb@defaultvalue.org>
Date: Sat, 9 Jul 2022 17:17:59 -0500
Subject: [PATCH] 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>
---
 .cirrus.yml                  | 13 +++++++------
 dev/prep-for-debianish-build |  2 +-
 dev/prep-for-freebsd-build   |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 46cc255..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,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 56ab0db..ef478ff 100755
--- 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 556b72d..0c6b047 100755
--- 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
         ;;
     *)
-- 
2.39.2