Update tests

This commit is contained in:
hwdsl2
2026-04-25 22:01:36 -05:00
parent 365d87d577
commit 126062f6ff

View File

@@ -17,7 +17,7 @@ jobs:
if: github.repository_owner == 'hwdsl2' if: github.repository_owner == 'hwdsl2'
strategy: strategy:
matrix: 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 fail-fast: false
container: container:
image: ${{ matrix.os_version }} image: ${{ matrix.os_version }}
@@ -45,7 +45,8 @@ jobs:
fi fi
restart_ipsec() { 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 whack --shutdown || true
ipsec pluto --config /etc/ipsec.conf ipsec pluto --config /etc/ipsec.conf
fi fi
@@ -87,6 +88,7 @@ jobs:
apt-get -yqq update apt-get -yqq update
apt-get -yqq install wget rsyslog apt-get -yqq install wget rsyslog
if [ "$os_ver" = "bookwormsid" ] || [ "$os_ver" = "trixiesid" ] \ if [ "$os_ver" = "bookwormsid" ] || [ "$os_ver" = "trixiesid" ] \
|| [ "$os_ver" = "forkysid" ] || [ "$os_ver" = 14 ] \
|| [ "$os_ver" = 13 ] || [ "$os_ver" = 12 ]; then || [ "$os_ver" = 13 ] || [ "$os_ver" = 12 ]; then
rsyslogd rsyslogd
else else
@@ -494,7 +496,8 @@ jobs:
sed -i '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpnup.sh"' vpnup.sh sed -i '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpnup.sh"' vpnup.sh
ver=5.2 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 ipsec whack --shutdown || true
fi fi
sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
@@ -515,7 +518,8 @@ jobs:
sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh
ver=5.3 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 ipsec whack --shutdown || true
fi fi
bash vpnup.sh <<ANSWERS bash vpnup.sh <<ANSWERS