Skip to content

Commit 126062f

Browse files
committed
Update tests
1 parent 365d87d commit 126062f

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

.github/workflows/test_set_2.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
if: github.repository_owner == 'hwdsl2'
1818
strategy:
1919
matrix:
20-
os_version: ["ubuntu:24.04", "ubuntu:22.04", "debian:13", "debian:12", "debian:11", "alpine:3.23", "alpine:3.22"]
20+
os_version: ["ubuntu:26.04", "ubuntu:24.04", "ubuntu:22.04", "debian:13", "debian:12", "debian:11", "alpine:3.23", "alpine:3.22"]
2121
fail-fast: false
2222
container:
2323
image: ${{ matrix.os_version }}
@@ -45,7 +45,8 @@ jobs:
4545
fi
4646
4747
restart_ipsec() {
48-
if [ "$os_type" = "alpine" ] || [ "$os_ver" = "trixiesid" ] || [ "$os_ver" = 13 ]; then
48+
if [ "$os_type" = "alpine" ] || [ "$os_ver" = "trixiesid" ] || [ "$os_ver" = 13 ] \
49+
|| [ "$os_ver" = "forkysid" ] || [ "$os_ver" = 14 ]; then
4950
ipsec whack --shutdown || true
5051
ipsec pluto --config /etc/ipsec.conf
5152
fi
@@ -87,6 +88,7 @@ jobs:
8788
apt-get -yqq update
8889
apt-get -yqq install wget rsyslog
8990
if [ "$os_ver" = "bookwormsid" ] || [ "$os_ver" = "trixiesid" ] \
91+
|| [ "$os_ver" = "forkysid" ] || [ "$os_ver" = 14 ] \
9092
|| [ "$os_ver" = 13 ] || [ "$os_ver" = 12 ]; then
9193
rsyslogd
9294
else
@@ -494,7 +496,8 @@ jobs:
494496
sed -i '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpnup.sh"' vpnup.sh
495497
496498
ver=5.2
497-
if [ "$os_type" = "alpine" ] || [ "$os_ver" = "trixiesid" ] || [ "$os_ver" = 13 ]; then
499+
if [ "$os_type" = "alpine" ] || [ "$os_ver" = "trixiesid" ] || [ "$os_ver" = 13 ] \
500+
|| [ "$os_ver" = "forkysid" ] || [ "$os_ver" = 14 ]; then
498501
ipsec whack --shutdown || true
499502
fi
500503
sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
@@ -515,7 +518,8 @@ jobs:
515518
sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh
516519
517520
ver=5.3
518-
if [ "$os_type" = "alpine" ] || [ "$os_ver" = "trixiesid" ] || [ "$os_ver" = 13 ]; then
521+
if [ "$os_type" = "alpine" ] || [ "$os_ver" = "trixiesid" ] || [ "$os_ver" = 13 ] \
522+
|| [ "$os_ver" = "forkysid" ] || [ "$os_ver" = 14 ]; then
519523
ipsec whack --shutdown || true
520524
fi
521525
bash vpnup.sh <<ANSWERS

0 commit comments

Comments
 (0)