Update tests

namibia · Oct 15, 2024 · 052e07b · 052e07b
1 parent 9442981
commit 052e07b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
@@ -18,6 +18,10 @@ jobs:
     if: github.repository_owner == 'hwdsl2'
     uses: ./.github/workflows/check_urls.yml
 
+  test_set_1:
+    needs: check_urls
+    uses: ./.github/workflows/test_set_1.yml
+
   test_set_2:
     needs: check_urls
     uses: ./.github/workflows/test_set_2.yml
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -16,13 +16,18 @@ on:
       - '**.sh'
       - '.github/workflows/main.yml'
       - '.github/workflows/shellcheck.yml'
+      - '.github/workflows/test_set_1.yml'
       - '.github/workflows/test_set_2.yml'
 
 jobs:
   shellcheck:
     if: github.repository_owner == 'hwdsl2'
     uses: ./.github/workflows/shellcheck.yml
 
+  test_set_1:
+    needs: shellcheck
+    uses: ./.github/workflows/test_set_1.yml
+
   test_set_2:
     needs: shellcheck
     uses: ./.github/workflows/test_set_2.yml
diff --git a/.github/workflows/test_set_1.yml b/.github/workflows/test_set_1.yml
@@ -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.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=5.0
+            [ -z "$ver" ] && ver=5.1
             ipsec --version | grep "$ver"
             ipsec status | grep -q l2tp-psk
             ipsec status | grep -q xauth-psk
@@ -538,13 +538,13 @@ jobs:
           fi
           sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh
 
-          for ver in 4.15 ""; do
+          for ver in 5.0 ""; do
             sed -i "s/^SWAN_VER=.*/SWAN_VER=$ver/" vpnup.sh
           bash vpnup.sh <<ANSWERS
 
           ANSWERS
             restart_ipsec
-            [ -z "$ver" ] && ver=5.0
+            [ -z "$ver" ] && ver=5.1
             ipsec --version | grep "$ver"
             ipsec status | grep -q l2tp-psk
             ipsec status | grep -q xauth-psk

diff --git a/.github/workflows/test_set_2.yml b/.github/workflows/test_set_2.yml
@@ -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.14 ""; do
+          for ver in 4.15 ""; do
             if [ "$os_type" = "alpine" ] \
               || grep -qs trixie /etc/debian_version; then
               ipsec whack --shutdown || true
@@ -504,7 +504,7 @@ jobs:
 
           ANSWERS
             restart_ipsec
-            [ -z "$ver" ] && ver=5.0
+            [ -z "$ver" ] && ver=5.1
             ipsec --version | grep "$ver"
             ipsec status | grep -q l2tp-psk
             ipsec status | grep -q xauth-psk
@@ -518,7 +518,7 @@ jobs:
           fi
           sed -i '/swan_ver_latest=/s/^/#/' vpnup.sh
 
-          for ver in 4.15 ""; do
+          for ver in 5.0 ""; do
             if [ "$os_type" = "alpine" ] \
               || grep -qs trixie /etc/debian_version; then
               ipsec whack --shutdown || true
@@ -528,7 +528,7 @@ jobs:
 
           ANSWERS
             restart_ipsec
-            [ -z "$ver" ] && ver=5.0
+            [ -z "$ver" ] && ver=5.1
             ipsec --version | grep "$ver"
             ipsec status | grep -q l2tp-psk
             ipsec status | grep -q xauth-psk