From d108c4a3c9e4e77bdefb2a5be381a4e01da91f31 Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Fri, 17 May 2024 20:45:05 -0500 Subject: [PATCH] Update tests --- .github/workflows/test_set_2.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_set_2.yml b/.github/workflows/test_set_2.yml index 6d80b87..552028f 100644 --- a/.github/workflows/test_set_2.yml +++ b/.github/workflows/test_set_2.yml @@ -17,7 +17,7 @@ jobs: if: github.repository_owner == 'hwdsl2' strategy: matrix: - os_version: ["ubuntu:22.04", "ubuntu:20.04", "debian:12", "debian:11", "debian:10", "alpine:3.19", "alpine:3.18"] + os_version: ["ubuntu:24.04", "ubuntu:22.04", "ubuntu:20.04", "debian:12", "debian:11", "debian:10", "alpine:3.19", "alpine:3.18"] fail-fast: false container: image: ${{ matrix.os_version }} @@ -495,7 +495,8 @@ jobs: sed -i '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpnup.sh"' vpnup.sh for ver in 4.14 ""; do - if [ "$os_type" = "alpine" ]; then + if [ "$os_type" = "alpine" ] \ + || grep -qs trixie /etc/debian_version; then ipsec whack --shutdown || true fi sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh @@ -518,7 +519,8 @@ jobs: sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh for ver in 4.15 ""; do - if [ "$os_type" = "alpine" ]; then + if [ "$os_type" = "alpine" ] \ + || grep -qs trixie /etc/debian_version; then ipsec whack --shutdown || true fi sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh