Migrate CI to srht and gh
0 views
Skip to first unread message
Rob Browning
Jun 16, 2026, 12:49:43 PM (9 days ago) Jun 16
to bup-...@googlegroups.com
Since cirrus is gone, migrate our CI to gh for some general testing on
ubuntu, and for macos tests, and to srht for debian and freebsd.
And add a new test for real ssh connections via the new
BUP_TEST_LOCAL_SSH. (i.e. not just the -r -:... testing path).
Pushed to main.
--
Rob Browning
rlb @defaultvalue.org and @debian.org
GPG as of 2011-07-10 E6A9 DA3C C9FD 1FF8 C676 D2C4 C0F0 39E9 ED1B 597A
GPG as of 2002-11-03 14DD 432F AE39 534D B592 F9A0 25C8 D377 8C7E 73A4
ubuntu, and for macos tests, and to srht for debian and freebsd.
And add a new test for real ssh connections via the new
BUP_TEST_LOCAL_SSH. (i.e. not just the -r -:... testing path).
Pushed to main.
--
Rob Browning
rlb @defaultvalue.org and @debian.org
GPG as of 2011-07-10 E6A9 DA3C C9FD 1FF8 C676 D2C4 C0F0 39E9 ED1B 597A
GPG as of 2002-11-03 14DD 432F AE39 534D B592 F9A0 25C8 D377 8C7E 73A4
Rob Browning
Jun 16, 2026, 12:49:44 PM (9 days ago) Jun 16
to bup-...@googlegroups.com
And adjust test-xdev to be able to handle a default ACL on the parent
dir. Noticed because the gh runner currently has one.
Signed-off-by: Rob Browning <r...@defaultvalue.org>
Tested-by: Rob Browning <r...@defaultvalue.org>
---
.cirrus.yml | 98 -----------------------------------
.github/workflows/general.yml | 46 ++++++++++++++++
test/ext/test-xdev | 13 +++--
3 files changed, 56 insertions(+), 101 deletions(-)
delete mode 100644 .cirrus.yml
create mode 100644 .github/workflows/general.yml
diff --git a/.cirrus.yml b/.cirrus.yml
deleted file mode 100644
index 7568801a..00000000
--- a/.cirrus.yml
+++ /dev/null
@@ -1,98 +0,0 @@
-
-task:
- name: debian check (root)
- only_if: $CIRRUS_BRANCH != "master"
- container:
- image: debian:bookworm
- cpu: 4
- memory: 2
- script: |
- set -xe
- dev/prep-for-debianish-build
- export LANG=C.UTF-8
- dev/system-info
- modprobe -q fuse || true
- modprobe -q loop || true
- BUP_PYTHON_CONFIG=python3-config ./configure --with-pylint=yes
- make -j6 check
- on_failure:
- debug_script:
- test -e config/config.vars || cat config.log 1>&2
-
-task:
- name: debian long-check
- only_if: $CIRRUS_BRANCH != "master"
- container:
- image: debian:bookworm
- cpu: 4
- memory: 2
- script: |
- set -xe
- dev/prep-for-debianish-build
- export LANG=C.UTF-8
- 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 .
- printf "make -j6 -C %q BUP_PYTHON_CONFIG=python3-config long-check" \
- "$(pwd)" | su -l -w BUP_TEST_OTHER_BUP bup
- on_failure:
- debug_script:
- test -e config/config.vars || cat config.log 1>&2
-
-task:
- name: debian check / lint
- only_if: $CIRRUS_BRANCH != "master"
- container:
- image: debian:trixie
- cpu: 4
- memory: 2
- script: |
- set -xe
- dev/prep-for-debianish-build
- export LANG=C.UTF-8
- dev/system-info
- adduser --disabled-password --gecos '' bup
- chown -R bup:bup .
- printf "make -j6 -C %q BUP_PYTHON_CONFIG=python3-config dev-check" \
- "$(pwd)" | su -l bup
- on_failure:
- debug_script:
- test -e config/config.vars || cat config.log 1>&2
-
-task:
- name: freebsd check / lint
- only_if: $CIRRUS_BRANCH != "master"
- freebsd_instance:
- image: freebsd-13-5-release-amd64
- cpu: 4
- memory: 4
- script: |
- set -xe
- dev/prep-for-freebsd-build
- dev/system-info
- gmake -j6 dev-check
- on_failure:
- debug_script:
- test -e config/config.vars || cat config.log 1>&2
-
-task:
- name: macos check / lint
- only_if: $CIRRUS_BRANCH != "master"
- macos_instance:
- # https://cirrus-ci.org/guide/macOS/
- image: ghcr.io/cirruslabs/macos-runner:sonoma
- script: |
- set -xe
- dev/prep-for-macos-build
- 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
- gmake -j6 BUP_PYTHON_CONFIG=python3-config LDFLAGS=-L/usr/local/lib dev-check
- on_failure:
- debug_script:
- test -e config/config.vars || cat config.log 1>&2
diff --git a/.github/workflows/general.yml b/.github/workflows/general.yml
new file mode 100644
index 00000000..0d625eda
--- /dev/null
+++ b/.github/workflows/general.yml
@@ -0,0 +1,46 @@
+name: general
+on: [push]
+defaults:
+ run:
+ shell: bash
+jobs:
+ ubuntu:
+ name: ubuntu long-check (root)
+ runs-on: ubuntu-24.04
+ steps:
+ - run: |
+ # We have to run our tests outside the runner-owned
+ # /home/runner tree; otherwise test-help fails because man,
+ # via "bup help save", gets EACCES for Documentation/. So
+ # we'll just clone into an independent /home/bup.
+ sudo -i gh_repo="$GITHUB_REPOSITORY" gh_ref="$GITHUB_REF_NAME" -- bash <<'EOF'
+ set -uexo pipefail
+ git clone --depth 10 -b "$gh_ref" "https://github.com/$gh_repo.git" /home/bup
+ cd /home/bup
+ dev/prep-for-debianish-build
+ DEBIAN_FRONTEND=noninteractive apt-get -y install bup
+ other_bup="$(command -v bup)"
+ "$other_bup" version
+ dev/system-info
+ BUP_TEST_OTHER_BUP="$other_bup" make -j "$(($(nproc) + 1))" long-check
+ EOF
+ macos:
+ name: macos lint/check
+ runs-on: macos-15
+ defaults:
+ run:
+ shell: bash
+ steps:
+ - run: |
+ set -ueo pipefail
+ git clone --depth 10 -b "$GITHUB_REF_NAME" "https://github.com/$GITHUB_REPOSITORY.git"
+ cd bup
+ dev/prep-for-macos-build
+ 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
+ trap 'test -e config/config.vars || cat config.log 1>&2' EXIT
+ export BUP_PYTHON_CONFIG=python3-config LANG=en_US.UTF-8
+ gmake -j "$(($(sysctl -n hw.logicalcpu) + 1))" LDFLAGS=-L/usr/local/lib dev-check
diff --git a/test/ext/test-xdev b/test/ext/test-xdev
index 00812439..a0487f22 100755
--- a/test/ext/test-xdev
+++ b/test/ext/test-xdev
@@ -38,13 +38,20 @@ WVPASS mkfs -t ext4 -F testfs-1.img
WVPASS mkfs -t ext4 -F testfs-2.img
WVPASS mkdir -p src/mnt-1/hidden-1 src/mnt-2/hidden-2
-WVEXPRC '*' mount -o loop,user_xattr testfs-1.img src/mnt-1
+WVEXPRC '*' mount -o loop,user_xattr,acl testfs-1.img src/mnt-1
if test "$?" -ne 0; then
WVSKIP 'Unable to mount via loopback'
exit 0
fi
-
-WVPASS mount -o loop,ext_attr,user_xattr testfs-2.img src/mnt-2
+WVPASS mount -o loop,user_xattr,acl testfs-2.img src/mnt-2
+
+# The new filesystems' roots (and their contents) won't have any
+# default attributes (e.g. ACLs) that directories created via mkdir
+# (or bup restore) do. Fix that to avoid avoid spurious compare-trees
+# differences.
+WVPASS rmdir src/mnt-1/lost+found src/mnt-2/lost+found
+WVPASS rsync -aHAX -d --no-recursive --exclude='*' -i src/ src/mnt-1/
+WVPASS rsync -aHAX -d --no-recursive --exclude='*' -i src/ src/mnt-2/
WVPASS touch src/1
--
2.47.3
dir. Noticed because the gh runner currently has one.
Signed-off-by: Rob Browning <r...@defaultvalue.org>
Tested-by: Rob Browning <r...@defaultvalue.org>
---
.cirrus.yml | 98 -----------------------------------
.github/workflows/general.yml | 46 ++++++++++++++++
test/ext/test-xdev | 13 +++--
3 files changed, 56 insertions(+), 101 deletions(-)
delete mode 100644 .cirrus.yml
create mode 100644 .github/workflows/general.yml
diff --git a/.cirrus.yml b/.cirrus.yml
deleted file mode 100644
index 7568801a..00000000
--- a/.cirrus.yml
+++ /dev/null
@@ -1,98 +0,0 @@
-
-task:
- name: debian check (root)
- only_if: $CIRRUS_BRANCH != "master"
- container:
- image: debian:bookworm
- cpu: 4
- memory: 2
- script: |
- set -xe
- dev/prep-for-debianish-build
- export LANG=C.UTF-8
- dev/system-info
- modprobe -q fuse || true
- modprobe -q loop || true
- BUP_PYTHON_CONFIG=python3-config ./configure --with-pylint=yes
- make -j6 check
- on_failure:
- debug_script:
- test -e config/config.vars || cat config.log 1>&2
-
-task:
- name: debian long-check
- only_if: $CIRRUS_BRANCH != "master"
- container:
- image: debian:bookworm
- cpu: 4
- memory: 2
- script: |
- set -xe
- dev/prep-for-debianish-build
- export LANG=C.UTF-8
- 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 .
- printf "make -j6 -C %q BUP_PYTHON_CONFIG=python3-config long-check" \
- "$(pwd)" | su -l -w BUP_TEST_OTHER_BUP bup
- on_failure:
- debug_script:
- test -e config/config.vars || cat config.log 1>&2
-
-task:
- name: debian check / lint
- only_if: $CIRRUS_BRANCH != "master"
- container:
- image: debian:trixie
- cpu: 4
- memory: 2
- script: |
- set -xe
- dev/prep-for-debianish-build
- export LANG=C.UTF-8
- dev/system-info
- adduser --disabled-password --gecos '' bup
- chown -R bup:bup .
- printf "make -j6 -C %q BUP_PYTHON_CONFIG=python3-config dev-check" \
- "$(pwd)" | su -l bup
- on_failure:
- debug_script:
- test -e config/config.vars || cat config.log 1>&2
-
-task:
- name: freebsd check / lint
- only_if: $CIRRUS_BRANCH != "master"
- freebsd_instance:
- image: freebsd-13-5-release-amd64
- cpu: 4
- memory: 4
- script: |
- set -xe
- dev/prep-for-freebsd-build
- dev/system-info
- gmake -j6 dev-check
- on_failure:
- debug_script:
- test -e config/config.vars || cat config.log 1>&2
-
-task:
- name: macos check / lint
- only_if: $CIRRUS_BRANCH != "master"
- macos_instance:
- # https://cirrus-ci.org/guide/macOS/
- image: ghcr.io/cirruslabs/macos-runner:sonoma
- script: |
- set -xe
- dev/prep-for-macos-build
- 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
- gmake -j6 BUP_PYTHON_CONFIG=python3-config LDFLAGS=-L/usr/local/lib dev-check
- on_failure:
- debug_script:
- test -e config/config.vars || cat config.log 1>&2
diff --git a/.github/workflows/general.yml b/.github/workflows/general.yml
new file mode 100644
index 00000000..0d625eda
--- /dev/null
+++ b/.github/workflows/general.yml
@@ -0,0 +1,46 @@
+name: general
+on: [push]
+defaults:
+ run:
+ shell: bash
+jobs:
+ ubuntu:
+ name: ubuntu long-check (root)
+ runs-on: ubuntu-24.04
+ steps:
+ - run: |
+ # We have to run our tests outside the runner-owned
+ # /home/runner tree; otherwise test-help fails because man,
+ # via "bup help save", gets EACCES for Documentation/. So
+ # we'll just clone into an independent /home/bup.
+ sudo -i gh_repo="$GITHUB_REPOSITORY" gh_ref="$GITHUB_REF_NAME" -- bash <<'EOF'
+ set -uexo pipefail
+ git clone --depth 10 -b "$gh_ref" "https://github.com/$gh_repo.git" /home/bup
+ cd /home/bup
+ dev/prep-for-debianish-build
+ DEBIAN_FRONTEND=noninteractive apt-get -y install bup
+ other_bup="$(command -v bup)"
+ "$other_bup" version
+ dev/system-info
+ BUP_TEST_OTHER_BUP="$other_bup" make -j "$(($(nproc) + 1))" long-check
+ EOF
+ macos:
+ name: macos lint/check
+ runs-on: macos-15
+ defaults:
+ run:
+ shell: bash
+ steps:
+ - run: |
+ set -ueo pipefail
+ git clone --depth 10 -b "$GITHUB_REF_NAME" "https://github.com/$GITHUB_REPOSITORY.git"
+ cd bup
+ dev/prep-for-macos-build
+ 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
+ trap 'test -e config/config.vars || cat config.log 1>&2' EXIT
+ export BUP_PYTHON_CONFIG=python3-config LANG=en_US.UTF-8
+ gmake -j "$(($(sysctl -n hw.logicalcpu) + 1))" LDFLAGS=-L/usr/local/lib dev-check
diff --git a/test/ext/test-xdev b/test/ext/test-xdev
index 00812439..a0487f22 100755
--- a/test/ext/test-xdev
+++ b/test/ext/test-xdev
@@ -38,13 +38,20 @@ WVPASS mkfs -t ext4 -F testfs-1.img
WVPASS mkfs -t ext4 -F testfs-2.img
WVPASS mkdir -p src/mnt-1/hidden-1 src/mnt-2/hidden-2
-WVEXPRC '*' mount -o loop,user_xattr testfs-1.img src/mnt-1
+WVEXPRC '*' mount -o loop,user_xattr,acl testfs-1.img src/mnt-1
if test "$?" -ne 0; then
WVSKIP 'Unable to mount via loopback'
exit 0
fi
-
-WVPASS mount -o loop,ext_attr,user_xattr testfs-2.img src/mnt-2
+WVPASS mount -o loop,user_xattr,acl testfs-2.img src/mnt-2
+
+# The new filesystems' roots (and their contents) won't have any
+# default attributes (e.g. ACLs) that directories created via mkdir
+# (or bup restore) do. Fix that to avoid avoid spurious compare-trees
+# differences.
+WVPASS rmdir src/mnt-1/lost+found src/mnt-2/lost+found
+WVPASS rsync -aHAX -d --no-recursive --exclude='*' -i src/ src/mnt-1/
+WVPASS rsync -aHAX -d --no-recursive --exclude='*' -i src/ src/mnt-2/
WVPASS touch src/1
--
2.47.3
Rob Browning
Jun 16, 2026, 12:49:44 PM (9 days ago) Jun 16
to bup-...@googlegroups.com
And avoid a test-save-restore git config dependency on the newer
set/unset sub-sub-commands.
Signed-off-by: Rob Browning <r...@defaultvalue.org>
Tested-by: Rob Browning <r...@defaultvalue.org>
---
.builds/debian-bookworm.yml | 13 +++++++++++++
.builds/debian-trixie.yml | 17 +++++++++++++++++
.builds/freebsd.yml | 17 +++++++++++++++++
test/ext/test-save-restore | 4 ++--
4 files changed, 49 insertions(+), 2 deletions(-)
create mode 100644 .builds/debian-bookworm.yml
create mode 100644 .builds/debian-trixie.yml
create mode 100644 .builds/freebsd.yml
diff --git a/.builds/debian-bookworm.yml b/.builds/debian-bookworm.yml
new file mode 100644
index 00000000..ddf3a4a5
--- /dev/null
+++ b/.builds/debian-bookworm.yml
@@ -0,0 +1,13 @@
+
+image: debian/bookworm
+sources:
+ - https://git.sr.ht/~rlb/bup
+tasks:
+ - prep: |
+ cd bup
+ sudo -i env -C "$(pwd)" dev/prep-for-debianish-build
+ dev/system-info
+ - check: |
+ cd bup
diff --git a/.builds/debian-trixie.yml b/.builds/debian-trixie.yml
new file mode 100644
index 00000000..c4d98cdd
--- /dev/null
+++ b/.builds/debian-trixie.yml
@@ -0,0 +1,17 @@
+
+image: debian/trixie
+sources:
+ - https://git.sr.ht/~rlb/bup
+tasks:
+ - prep: |
+ cd bup
+ sudo -i env -C "$(pwd)" dev/prep-for-debianish-build
+ dev/system-info
+ - lint: |
+ cd bup
+ - check: |
+ cd bup
diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
new file mode 100644
index 00000000..9c52c02a
--- /dev/null
+++ b/.builds/freebsd.yml
@@ -0,0 +1,17 @@
+
+image: freebsd/14.x
+sources:
+ - https://git.sr.ht/~rlb/bup
+tasks:
+ - prep: |
+ cd bup
+ sudo -i env -C "$(pwd)" dev/prep-for-freebsd-build
+ dev/system-info
+ - lint: |
+ cd bup
+ - check: |
+ cd bup
diff --git a/test/ext/test-save-restore b/test/ext/test-save-restore
index 4da39970..24fe7941 100755
--- a/test/ext/test-save-restore
+++ b/test/ext/test-save-restore
@@ -71,10 +71,10 @@ WVPASS grep -E '^error: --strip-path is incompatible with --graft' log
WVFAIL err-to log bup save -n main --graft x/y src
WVPASS grep -E '^error: a graft point must be of the form old_path=new_path' log
-WVPASS git --git-dir bup config set bup.split.trees 42
+WVPASS git --git-dir bup config bup.split.trees 42
WVFAIL err-to log bup save -n main /dev/null
WVPASS grep -E '^error: got invalid bool value 42 from git config' log
-WVPASS git --git-dir bup config unset bup.split.trees
+WVPASS git --git-dir bup config --unset bup.split.trees
WVSTART 'restore (argument validation)'
--
2.47.3
set/unset sub-sub-commands.
Signed-off-by: Rob Browning <r...@defaultvalue.org>
Tested-by: Rob Browning <r...@defaultvalue.org>
---
.builds/debian-trixie.yml | 17 +++++++++++++++++
.builds/freebsd.yml | 17 +++++++++++++++++
test/ext/test-save-restore | 4 ++--
4 files changed, 49 insertions(+), 2 deletions(-)
create mode 100644 .builds/debian-bookworm.yml
create mode 100644 .builds/debian-trixie.yml
create mode 100644 .builds/freebsd.yml
diff --git a/.builds/debian-bookworm.yml b/.builds/debian-bookworm.yml
new file mode 100644
index 00000000..ddf3a4a5
--- /dev/null
+++ b/.builds/debian-bookworm.yml
@@ -0,0 +1,13 @@
+
+image: debian/bookworm
+sources:
+ - https://git.sr.ht/~rlb/bup
+tasks:
+ - prep: |
+ cd bup
+ sudo -i env -C "$(pwd)" dev/prep-for-debianish-build
+ dev/system-info
+ - check: |
+ cd bup
+ trap 'test -e config/config.vars || cat config.log 1>&2' EXIT
+ make -j "$(($(nproc) + 1))" check
diff --git a/.builds/debian-trixie.yml b/.builds/debian-trixie.yml
new file mode 100644
index 00000000..c4d98cdd
--- /dev/null
+++ b/.builds/debian-trixie.yml
@@ -0,0 +1,17 @@
+
+image: debian/trixie
+sources:
+ - https://git.sr.ht/~rlb/bup
+tasks:
+ - prep: |
+ cd bup
+ sudo -i env -C "$(pwd)" dev/prep-for-debianish-build
+ dev/system-info
+ - lint: |
+ cd bup
+ trap 'test -e config/config.vars || cat config.log 1>&2' EXIT
+ make -j "$(($(nproc) + 1))" lint
+ - check: |
+ cd bup
+ trap 'test -e config/config.vars || cat config.log 1>&2' EXIT
+ make -j "$(($(nproc) + 1))" check
diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
new file mode 100644
index 00000000..9c52c02a
--- /dev/null
+++ b/.builds/freebsd.yml
@@ -0,0 +1,17 @@
+
+image: freebsd/14.x
+sources:
+ - https://git.sr.ht/~rlb/bup
+tasks:
+ - prep: |
+ cd bup
+ sudo -i env -C "$(pwd)" dev/prep-for-freebsd-build
+ dev/system-info
+ - lint: |
+ cd bup
+ trap 'test -e config/config.vars || cat config.log 1>&2' EXIT
+ gmake -j "$(($(nproc) + 1))" lint
+ - check: |
+ cd bup
+ trap 'test -e config/config.vars || cat config.log 1>&2' EXIT
+ gmake -j "$(($(nproc) + 1))" check
diff --git a/test/ext/test-save-restore b/test/ext/test-save-restore
index 4da39970..24fe7941 100755
--- a/test/ext/test-save-restore
+++ b/test/ext/test-save-restore
@@ -71,10 +71,10 @@ WVPASS grep -E '^error: --strip-path is incompatible with --graft' log
WVFAIL err-to log bup save -n main --graft x/y src
WVPASS grep -E '^error: a graft point must be of the form old_path=new_path' log
-WVPASS git --git-dir bup config set bup.split.trees 42
+WVPASS git --git-dir bup config bup.split.trees 42
WVFAIL err-to log bup save -n main /dev/null
WVPASS grep -E '^error: got invalid bool value 42 from git config' log
-WVPASS git --git-dir bup config unset bup.split.trees
+WVPASS git --git-dir bup config --unset bup.split.trees
WVSTART 'restore (argument validation)'
--
2.47.3
Reply all
Reply to author
Forward
0 new messages