mirror of
https://github.com/chatmail/relay.git
synced 2026-05-13 17:34:38 +00:00
ci: migrate from --no-dns to --type ipv4 for cmlxc compatibility
This commit is contained in:
17
.github/workflows/ci-no-dns.yaml
vendored
17
.github/workflows/ci-no-dns.yaml
vendored
@@ -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
|
||||
|
||||
3
.github/workflows/ci.yaml
vendored
3
.github/workflows/ci.yaml
vendored
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user