From 952be30fb99d09511b13d32f5e39c2af437cf269 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Sun, 10 May 2026 20:51:30 +0200 Subject: [PATCH] ci: migrate from --no-dns to --type ipv4 for cmlxc compatibility --- .github/workflows/ci-no-dns.yaml | 17 +++++++++-------- .github/workflows/ci.yaml | 3 +-- chatmaild/src/chatmaild/config.py | 1 - 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci-no-dns.yaml b/.github/workflows/ci-no-dns.yaml index 620bf083..bec903df 100644 --- a/.github/workflows/ci-no-dns.yaml +++ b/.github/workflows/ci-no-dns.yaml @@ -18,19 +18,20 @@ concurrency: jobs: no-dns: name: LXC deploy and test - uses: chatmail/cmlxc/.github/workflows/lxc-test.yml@v0.13.5 + uses: chatmail/cmlxc/.github/workflows/lxc-test.yml@v0.14.1 with: - cmlxc_version: v0.13.5 cmlxc_commands: | cmlxc init # single cmdeploy relay test - cmlxc -v deploy-cmdeploy --source ./repo --ipv4-only --no-dns cm0 - cmlxc -v test-cmdeploy --no-dns cm0 + cmlxc -v deploy-cmdeploy --source ./repo --type ipv4 cm0 + cmlxc -v test-cmdeploy cm0 - # cross cmdeploy relay test - cmlxc -v deploy-cmdeploy --source ./repo cm1 - cmlxc -v test-cmdeploy --no-dns cm0 cm1 + # cross cmdeploy relay test (two ipv4 relays) + cmlxc -v deploy-cmdeploy --source ./repo --ipv4-only --type ipv4 cm1 + cmlxc -v test-cmdeploy cm0 cm1 # cross cmdeploy/madmail relay tests cmlxc -v deploy-madmail mad0 - cmlxc -v test-cmdeploy --no-dns cm0 mad0 + cmlxc -v test-cmdeploy cm0 mad0 + cmlxc -v test-mini mad0 cm0 + cmlxc -v test-mini cm0 mad0 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6241fbe0..85c8f0fd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -57,9 +57,8 @@ jobs: lxc-test: name: LXC deploy and test - uses: chatmail/cmlxc/.github/workflows/lxc-test.yml@v0.13.5 + uses: chatmail/cmlxc/.github/workflows/lxc-test.yml@v0.14.1 with: - cmlxc_version: v0.13.5 cmlxc_commands: | cmlxc init # single cmdeploy relay test diff --git a/chatmaild/src/chatmaild/config.py b/chatmaild/src/chatmaild/config.py index 2767be75..25e7a5b5 100644 --- a/chatmaild/src/chatmaild/config.py +++ b/chatmaild/src/chatmaild/config.py @@ -200,7 +200,6 @@ def is_valid_ipv4(address: str) -> bool: return False - def format_arpa_address(address: str) -> str: if is_valid_ipv4(address): return ipaddress.IPv4Address(address).reverse_pointer