From 750246beed6307733d7ecef0d26c030e2d689f8a Mon Sep 17 00:00:00 2001 From: hwdsl2 Date: Wed, 4 Jan 2023 20:57:52 -0600 Subject: [PATCH] Update tests --- .github/workflows/test_set_1.yml | 5 ++--- .github/workflows/test_set_2.yml | 7 +------ .github/workflows/test_set_3.yml | 3 +-- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test_set_1.yml b/.github/workflows/test_set_1.yml index eef0bc2..1fe2532 100644 --- a/.github/workflows/test_set_1.yml +++ b/.github/workflows/test_set_1.yml @@ -11,7 +11,7 @@ jobs: if: github.repository_owner == 'hwdsl2' strategy: matrix: - os_version: ["centos:9s", "centos:8s", "centos:7", "rockylinux:9", "rockylinux:8", "almalinux:9", "almalinux:8", "amazonlinux:2"] + os_version: ["centos:9s", "centos:8s", "centos:7", "rockylinux:8", "almalinux:9", "almalinux:8", "amazonlinux:2"] fail-fast: false env: OS_VERSION: ${{ matrix.os_version }} @@ -42,8 +42,7 @@ jobs: cd /opt/src yum -y -q update - yum -y -q install wget rsyslog kmod procps-ng net-tools - systemctl start rsyslog + yum -y -q install wget kmod procps-ng net-tools cp -f /opt/src/scripts/openvpn-install.sh ./openvpn.sh diff --git a/.github/workflows/test_set_2.yml b/.github/workflows/test_set_2.yml index adb6486..6326789 100644 --- a/.github/workflows/test_set_2.yml +++ b/.github/workflows/test_set_2.yml @@ -31,12 +31,7 @@ jobs: export DEBIAN_FRONTEND=noninteractive apt-get -yqq update apt-get -yqq dist-upgrade - apt-get -yqq install wget rsyslog kmod procps net-tools - if grep -qs bookworm /etc/debian_version; then - rsyslogd - else - service rsyslog start - fi + apt-get -yqq install wget kmod procps net-tools cp -f "$GITHUB_WORKSPACE"/openvpn-install.sh ./openvpn.sh diff --git a/.github/workflows/test_set_3.yml b/.github/workflows/test_set_3.yml index b177b80..44b54a6 100644 --- a/.github/workflows/test_set_3.yml +++ b/.github/workflows/test_set_3.yml @@ -28,8 +28,7 @@ jobs: export DEBIAN_FRONTEND=noninteractive sudo apt-get -yqq update sudo apt-get -yqq dist-upgrade - sudo apt-get -yqq install wget rsyslog - sudo service rsyslog start + sudo apt-get -yqq install wget cp -f "$GITHUB_WORKSPACE"/openvpn-install.sh ./openvpn.sh