From 126062f6ffb112f3dd7bfee74b6059c5c5140eb9 Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Sat, 25 Apr 2026 22:01:36 -0500 Subject: [PATCH] Update tests --- .github/workflows/test_set_2.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test_set_2.yml b/.github/workflows/test_set_2.yml index 8148179..2474872 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:24.04", "ubuntu:22.04", "debian:13", "debian:12", "debian:11", "alpine:3.23", "alpine:3.22"] + os_version: ["ubuntu:26.04", "ubuntu:24.04", "ubuntu:22.04", "debian:13", "debian:12", "debian:11", "alpine:3.23", "alpine:3.22"] fail-fast: false container: image: ${{ matrix.os_version }} @@ -45,7 +45,8 @@ jobs: fi restart_ipsec() { - if [ "$os_type" = "alpine" ] || [ "$os_ver" = "trixiesid" ] || [ "$os_ver" = 13 ]; then + if [ "$os_type" = "alpine" ] || [ "$os_ver" = "trixiesid" ] || [ "$os_ver" = 13 ] \ + || [ "$os_ver" = "forkysid" ] || [ "$os_ver" = 14 ]; then ipsec whack --shutdown || true ipsec pluto --config /etc/ipsec.conf fi @@ -87,6 +88,7 @@ jobs: apt-get -yqq update apt-get -yqq install wget rsyslog if [ "$os_ver" = "bookwormsid" ] || [ "$os_ver" = "trixiesid" ] \ + || [ "$os_ver" = "forkysid" ] || [ "$os_ver" = 14 ] \ || [ "$os_ver" = 13 ] || [ "$os_ver" = 12 ]; then rsyslogd else @@ -494,7 +496,8 @@ jobs: sed -i '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpnup.sh"' vpnup.sh ver=5.2 - if [ "$os_type" = "alpine" ] || [ "$os_ver" = "trixiesid" ] || [ "$os_ver" = 13 ]; then + if [ "$os_type" = "alpine" ] || [ "$os_ver" = "trixiesid" ] || [ "$os_ver" = 13 ] \ + || [ "$os_ver" = "forkysid" ] || [ "$os_ver" = 14 ]; then ipsec whack --shutdown || true fi sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh @@ -515,7 +518,8 @@ jobs: sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh ver=5.3 - if [ "$os_type" = "alpine" ] || [ "$os_ver" = "trixiesid" ] || [ "$os_ver" = 13 ]; then + if [ "$os_type" = "alpine" ] || [ "$os_ver" = "trixiesid" ] || [ "$os_ver" = 13 ] \ + || [ "$os_ver" = "forkysid" ] || [ "$os_ver" = 14 ]; then ipsec whack --shutdown || true fi bash vpnup.sh <