mirror/setup-ipsec-vpn
1
0
Fork 0
mirror of synced 2024-11-26 23:06:03 +03:00
Code Issues Projects Releases Wiki Activity

Update tests

Browse Source
This commit is contained in:
hwdsl2 2021-08-03 00:49:11 -05:00
parent ab50fa7264
commit 72ad762184
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.github/workflows/cron.yml vendored
View File

@ -29,8 +29,8 @@ jobs:
set -x set -x
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
sudo apt-get -yq update sudo apt-get -yqq update
sudo apt-get -yq install wget curl sudo apt-get -yqq install wget curl
wget_c="wget -t 3 -T 30 -nv -O" wget_c="wget -t 3 -T 30 -nv -O"
gh_url="https://github.com/hwdsl2/setup-ipsec-vpn/raw/master" gh_url="https://github.com/hwdsl2/setup-ipsec-vpn/raw/master"
@ -77,7 +77,7 @@ jobs:
if: github.repository_owner == 'hwdsl2' if: github.repository_owner == 'hwdsl2'
strategy: strategy:
matrix: matrix:
os_version: ["centos:8", "centos:8s", "centos:7", "amazonlinux:2"] os_version: ["centos:8", "centos:8s", "centos:7", "rockylinux:8", "almalinux:8", "amazonlinux:2"]
fail-fast: false fail-fast: false
env: env:
OS_VERSION: ${{ matrix.os_version }} OS_VERSION: ${{ matrix.os_version }}
@ -132,11 +132,11 @@ jobs:
echo echo
} }
yum -y update yum -y -q update
yum -y -q install wget rsyslog yum -y -q install wget rsyslog
systemctl start rsyslog systemctl start rsyslog
if [ "$1" = "centos" ]; then if [ "$1" != "amazon" ]; then
wget -t 3 -T 30 -nv -O vpnsetup.sh https://git.io/vpnsetup-centos wget -t 3 -T 30 -nv -O vpnsetup.sh https://git.io/vpnsetup-centos
else else
wget -t 3 -T 30 -nv -O vpnsetup.sh https://git.io/vpnsetup-amzn wget -t 3 -T 30 -nv -O vpnsetup.sh https://git.io/vpnsetup-amzn
@ -293,7 +293,7 @@ jobs:
sed -i '/pluto/d' "$log1" sed -i '/pluto/d' "$log1"
pkill -HUP rsyslog pkill -HUP rsyslog
if [ "$1" = "centos" ]; then if [ "$1" != "amazon" ]; then
wget -t 3 -T 30 -nv -O vpnup.sh https://git.io/vpnupgrade-centos wget -t 3 -T 30 -nv -O vpnup.sh https://git.io/vpnupgrade-centos
else else
wget -t 3 -T 30 -nv -O vpnup.sh https://git.io/vpnupgrade-amzn wget -t 3 -T 30 -nv -O vpnup.sh https://git.io/vpnupgrade-amzn
@ -333,6 +333,8 @@ jobs:
if [ "$OS_VERSION" = "centos:8s" ]; then if [ "$OS_VERSION" = "centos:8s" ]; then
echo "FROM quay.io/centos/centos:stream8" > Dockerfile echo "FROM quay.io/centos/centos:stream8" > Dockerfile
elif [ "$OS_VERSION" = "rockylinux:8" ]; then
echo "FROM rockylinux/rockylinux:8" > Dockerfile
else else
echo "FROM $OS_VERSION" > Dockerfile echo "FROM $OS_VERSION" > Dockerfile
fi fi
@ -389,7 +391,7 @@ jobs:
fail-fast: false fail-fast: false
container: container:
image: ${{ matrix.os_version }} image: ${{ matrix.os_version }}
options: --privileged -v /lib/modules:/lib/modules:ro options: --cap-add=NET_ADMIN --device=/dev/ppp
steps: steps:
- name: Test - name: Test
run: | run: |
@ -431,9 +433,9 @@ jobs:
echo "# hwdsl2" > run.sh echo "# hwdsl2" > run.sh
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
apt-get -yq update apt-get -yqq update
apt-get -yq dist-upgrade apt-get -yqq dist-upgrade
apt-get -yq install wget rsyslog apt-get -yqq install wget rsyslog
service rsyslog start service rsyslog start
wget -t 3 -T 30 -nv -O vpnsetup.sh https://git.io/vpnsetup wget -t 3 -T 30 -nv -O vpnsetup.sh https://git.io/vpnsetup

26
.github/workflows/main.yml vendored
View File

@ -28,8 +28,8 @@ jobs:
run: | run: |
if [ ! -x /usr/bin/shellcheck ]; then if [ ! -x /usr/bin/shellcheck ]; then
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
sudo apt-get -yq update sudo apt-get -yqq update
sudo apt-get -yq install shellcheck sudo apt-get -yqq install shellcheck
fi fi
cd "$GITHUB_WORKSPACE" cd "$GITHUB_WORKSPACE"
@ -58,8 +58,8 @@ jobs:
set -x set -x
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
sudo apt-get -yq update sudo apt-get -yqq update
sudo apt-get -yq install wget curl sudo apt-get -yqq install wget curl
wget_c="wget -t 3 -T 30 -nv -O" wget_c="wget -t 3 -T 30 -nv -O"
gh_url="https://github.com/hwdsl2/setup-ipsec-vpn/raw/master" gh_url="https://github.com/hwdsl2/setup-ipsec-vpn/raw/master"
@ -106,7 +106,7 @@ jobs:
if: github.repository_owner == 'hwdsl2' if: github.repository_owner == 'hwdsl2'
strategy: strategy:
matrix: matrix:
os_version: ["centos:8", "centos:8s", "centos:7", "amazonlinux:2"] os_version: ["centos:8", "centos:8s", "centos:7", "rockylinux:8", "almalinux:8", "amazonlinux:2"]
fail-fast: false fail-fast: false
env: env:
OS_VERSION: ${{ matrix.os_version }} OS_VERSION: ${{ matrix.os_version }}
@ -161,11 +161,11 @@ jobs:
echo echo
} }
yum -y update yum -y -q update
yum -y -q install wget rsyslog yum -y -q install wget rsyslog
systemctl start rsyslog systemctl start rsyslog
if [ "$1" = "centos" ]; then if [ "$1" != "amazon" ]; then
wget -t 3 -T 30 -nv -O vpnsetup.sh https://git.io/vpnsetup-centos wget -t 3 -T 30 -nv -O vpnsetup.sh https://git.io/vpnsetup-centos
else else
wget -t 3 -T 30 -nv -O vpnsetup.sh https://git.io/vpnsetup-amzn wget -t 3 -T 30 -nv -O vpnsetup.sh https://git.io/vpnsetup-amzn
@ -322,7 +322,7 @@ jobs:
sed -i '/pluto/d' "$log1" sed -i '/pluto/d' "$log1"
pkill -HUP rsyslog pkill -HUP rsyslog
if [ "$1" = "centos" ]; then if [ "$1" != "amazon" ]; then
wget -t 3 -T 30 -nv -O vpnup.sh https://git.io/vpnupgrade-centos wget -t 3 -T 30 -nv -O vpnup.sh https://git.io/vpnupgrade-centos
else else
wget -t 3 -T 30 -nv -O vpnup.sh https://git.io/vpnupgrade-amzn wget -t 3 -T 30 -nv -O vpnup.sh https://git.io/vpnupgrade-amzn
@ -362,6 +362,8 @@ jobs:
if [ "$OS_VERSION" = "centos:8s" ]; then if [ "$OS_VERSION" = "centos:8s" ]; then
echo "FROM quay.io/centos/centos:stream8" > Dockerfile echo "FROM quay.io/centos/centos:stream8" > Dockerfile
elif [ "$OS_VERSION" = "rockylinux:8" ]; then
echo "FROM rockylinux/rockylinux:8" > Dockerfile
else else
echo "FROM $OS_VERSION" > Dockerfile echo "FROM $OS_VERSION" > Dockerfile
fi fi
@ -418,7 +420,7 @@ jobs:
fail-fast: false fail-fast: false
container: container:
image: ${{ matrix.os_version }} image: ${{ matrix.os_version }}
options: --privileged -v /lib/modules:/lib/modules:ro options: --cap-add=NET_ADMIN --device=/dev/ppp
steps: steps:
- name: Test - name: Test
run: | run: |
@ -460,9 +462,9 @@ jobs:
echo "# hwdsl2" > run.sh echo "# hwdsl2" > run.sh
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
apt-get -yq update apt-get -yqq update
apt-get -yq dist-upgrade apt-get -yqq dist-upgrade
apt-get -yq install wget rsyslog apt-get -yqq install wget rsyslog
service rsyslog start service rsyslog start
wget -t 3 -T 30 -nv -O vpnsetup.sh https://git.io/vpnsetup wget -t 3 -T 30 -nv -O vpnsetup.sh https://git.io/vpnsetup