fixup! more fixes to support container/root mount action

diff --git a/.github/workflows/compatibility.yaml b/.github/workflows/compatibility.yaml
index 9106371b97d0a1d7f963639058726a6180ceed3f..904f681bf9e6b5999b18119bccff7cd773d50dcc 100644 (file)
--- a/.github/workflows/compatibility.yaml
+++ b/.github/workflows/compatibility.yaml
@@ -24,7 +24,7 @@ jobs:
       - name: Install dependencies (container is root)
         run: |
           apt-get update
-          apt-get install -y curl gnupg make git python3-docutils
+          apt-get install -y curl gnupg make git python3-docutils rsync
 
       - name: Tool versions (check)
         run: |

diff --git a/tests/system-test-multikey.sh b/tests/system-test-multikey.sh
index 6d65c2f15fbbe43cc36137362c6d3462945ab9f7..5bada03f37a3e5d6c24280596a386b89fab387de 100755 (executable)
--- a/tests/system-test-multikey.sh
+++ b/tests/system-test-multikey.sh
@@ -26,12 +26,11 @@ version_lt() {
        [ "$1" = "$(echo -e "$1\n$2" | sort -V | head -n1)" ]
 }
 
-# Determine if we expect the bug (Threshold: >= 2.2.20 assumed for now)
-# Ubuntu 20.04 (2.2.19) does NOT have the bug.
-# Ubuntu 22.04 (2.2.27) likely has it.
+# Determine if we expect the bug (Threshold: >= 2.4.5 assumed for now)
+# Ubuntu 22.04 (2.2.27) confirmed NOT to have it.
 # Arch (2.4.9) definitely has it.
 expect_bug=1
-if version_lt "$gpg_ver" "2.2.20"; then
+if version_lt "$gpg_ver" "2.4.5"; then
        print_warn "GPG version $gpg_ver is old. We do not expect the checksum bug here."
        expect_bug=0
 else
@@ -80,6 +79,7 @@ umask 077
 tempdir=$(mktemp -d)
 readonly tempdir
 trap 'rm -Rf -- "${tempdir}"' EXIT
+export HOME="${tempdir}"
 
 # Setup PATH to use local git-remote-gcrypt
 PATH=${PWD}:${PATH}

diff --git a/tests/system-test-privacy-leaks.sh b/tests/system-test-privacy-leaks.sh
index 17f323ce39be4ecafa58623a588dba1fbf469c20..8b277bc6057630bb3ef204aae856dd1e99d05cac 100755 (executable)
--- a/tests/system-test-privacy-leaks.sh
+++ b/tests/system-test-privacy-leaks.sh
@@ -12,6 +12,7 @@ umask 077
 tempdir=$(mktemp -d)
 readonly tempdir
 trap 'rm -Rf -- "$tempdir"' EXIT
+export HOME="${tempdir}"
 
 # Ensure git-remote-gcrypt is in PATH
 repo_root="${PWD}"

diff --git a/tests/system-test-repack.sh b/tests/system-test-repack.sh
index 02216834b1f2c6d156926341960f0e218b4417d1..c43c2529a976b6c29afbb0a8b5b6f0c74cb108c4 100755 (executable)
--- a/tests/system-test-repack.sh
+++ b/tests/system-test-repack.sh
@@ -44,6 +44,7 @@ tempdir=$(mktemp -d)
 readonly tempdir
 # shellcheck disable=SC2064
 trap "rm -Rf -- '${tempdir}'" EXIT
+export HOME="${tempdir}"
 
 # Set up the PATH
 repo_root="${PWD}"

diff --git a/tests/system-test-rsync-simple.sh b/tests/system-test-rsync-simple.sh
index eeafc325bd6b700d19044abcb48987ea62e47c34..57e99a2fc620de5bf11ad87541dd4c03355756fc 100755 (executable)
--- a/tests/system-test-rsync-simple.sh
+++ b/tests/system-test-rsync-simple.sh
@@ -1,5 +1,12 @@
 #!/bin/bash
 set -e
+
+# Skip if rsync not found (don't fail CI)
+if ! command -v rsync &>/dev/null; then
+       echo "rsync not found, skipping test."
+       exit 0
+fi
+
 mkdir -p .tmp/simple_src .tmp/simple_dst/subdir
 touch .tmp/simple_dst/subdir/badfile
 touch .tmp/simple_dst/subdir/goodfile

diff --git a/tests/system-test-safety-check.sh b/tests/system-test-safety-check.sh
index 3f5587a6540e0c6ccdf9e7070f53b16f8cd32497..254c4a3e1856a423768b2e480065f50059ed3743 100755 (executable)
--- a/tests/system-test-safety-check.sh
+++ b/tests/system-test-safety-check.sh
@@ -25,6 +25,7 @@ GIT="git -c advice.defaultBranchName=false"
 # Create temp directory
 tempdir=$(mktemp -d)
 trap 'rm -rf "$tempdir"' EXIT
+export HOME="${tempdir}"
 
 # Isolate git config to prevent leaks from other tests
 export GIT_CONFIG_GLOBAL="${tempdir}/gitconfig"

diff --git a/tests/system-test.sh b/tests/system-test.sh
index 71ef23b2337d72a763ff412a46cc75268b52b0a8..43f37d301e2228045b13363827dc71fd2e4b78a0 100755 (executable)
--- a/tests/system-test.sh
+++ b/tests/system-test.sh
@@ -69,6 +69,7 @@ tempdir=$(mktemp -d)
 readonly tempdir
 # shellcheck disable=SC2064
 trap "rm -Rf -- '${tempdir}'" EXIT
+export HOME="${tempdir}"
 
 # Set up the PATH to favor the version of git-remote-gcrypt from the repository
 # rather than a version that might already be installed on the user's system.