Skip to content

Commit

Permalink
Update tests
Browse files Browse the repository at this point in the history
  • Loading branch information
hwdsl2 committed May 3, 2024
1 parent b5d19d7 commit 2ba4fe3
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/test_set_1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -518,13 +518,13 @@ jobs:
cp -f /opt/src/scripts/extras/vpnupgrade.sh ./vpnup.sh
sed -i '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpnup.sh"' vpnup.sh
for ver in 4.12 ""; do
for ver in 4.14 ""; do
sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
bash vpnup.sh <<ANSWERS
ANSWERS
restart_ipsec
[ -z "$ver" ] && ver=4.15
[ -z "$ver" ] && ver=5.0
ipsec --version | grep "$ver"
ipsec status | grep -q l2tp-psk
ipsec status | grep -q xauth-psk
Expand All @@ -538,13 +538,13 @@ jobs:
fi
sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh
for ver in 4.14 ""; do
for ver in 4.15 ""; do
sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
bash vpnup.sh <<ANSWERS
ANSWERS
restart_ipsec
[ -z "$ver" ] && ver=4.15
[ -z "$ver" ] && ver=5.0
ipsec --version | grep "$ver"
ipsec status | grep -q l2tp-psk
ipsec status | grep -q xauth-psk
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test_set_2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
if: github.repository_owner == 'hwdsl2'
strategy:
matrix:
os_version: ["ubuntu:24.04", "ubuntu:22.04", "ubuntu:20.04", "debian:12", "debian:11", "debian:10", "alpine:3.19", "alpine:3.18"]
os_version: ["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 }}
Expand Down Expand Up @@ -494,7 +494,7 @@ jobs:
cp -f "$GITHUB_WORKSPACE"/extras/vpnupgrade.sh ./vpnup.sh
sed -i '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpnup.sh"' vpnup.sh
for ver in 4.12 ""; do
for ver in 4.14 ""; do
if [ "$os_type" = "alpine" ]; then
ipsec whack --shutdown || true
fi
Expand All @@ -503,7 +503,7 @@ jobs:
ANSWERS
restart_ipsec
[ -z "$ver" ] && ver=4.15
[ -z "$ver" ] && ver=5.0
ipsec --version | grep "$ver"
ipsec status | grep -q l2tp-psk
ipsec status | grep -q xauth-psk
Expand All @@ -517,7 +517,7 @@ jobs:
fi
sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh
for ver in 4.14 ""; do
for ver in 4.15 ""; do
if [ "$os_type" = "alpine" ]; then
ipsec whack --shutdown || true
fi
Expand All @@ -526,7 +526,7 @@ jobs:
ANSWERS
restart_ipsec
[ -z "$ver" ] && ver=4.15
[ -z "$ver" ] && ver=5.0
ipsec --version | grep "$ver"
ipsec status | grep -q l2tp-psk
ipsec status | grep -q xauth-psk
Expand Down

0 comments on commit 2ba4fe3

Please sign in to comment.