[PATCH 0/3] cirrus: update debian, freebsd, macos

[Rob Browning]

Pushed.

Rob Browning (3):
cirrus: use apt-get, not apt to install bup
cirrus: update freebsd python, debian to bullseye, macos to monterey
test-sparse-files: increase the test size for macos/afs

.cirrus.yml | 15 ++++++++-------
dev/prep-for-debianish-build | 2 +-
dev/prep-for-freebsd-build | 2 +-
test/ext/test-sparse-files | 2 +-
4 files changed, 11 insertions(+), 10 deletions(-)

--
2.30.2

[Rob Browning]

Signed-off-by: Rob Browning <r...@defaultvalue.org>
Tested-by: Rob Browning <r...@defaultvalue.org>
---
.cirrus.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 639cc2b1..46cc2552 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -21,7 +21,7 @@ task:
script: |
set -xe
dev/prep-for-debianish-build python3
- apt install bup
+ DEBIAN_FRONTEND=noninteractive apt-get -y install bup
export BUP_TEST_OTHER_BUP="$(command -v bup)"
"$BUP_TEST_OTHER_BUP" version
dev/system-info
--
2.30.2

[Rob Browning]

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 <r...@defaultvalue.org>
Tested-by: Rob Browning <r...@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 46cc2552..77d74b08 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 56ab0dbd..ef478ffb 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 556b72de..0c6b047c 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.30.2