diff --git a/.github/workflows/check_urls.yml b/.github/workflows/check_urls.yml index cec311d..97b5bf6 100644 --- a/.github/workflows/check_urls.yml +++ b/.github/workflows/check_urls.yml @@ -39,7 +39,8 @@ jobs: $wg vpnsetup_amzn.sh "$gi/vpnsetup-amzn" $wg vpnsetup_ubuntu.sh "$gi/vpnsetup-ubuntu" $wg vpnsetup_alpine.sh "$gi/vpnsetup-alpine" - $wg quickstart.sh "$gi/vpnquickstart" + $wg quickstart.sh "$gi/vpnstart" + $wg quickstart_.sh "$gi/vpnquickstart" $wg ikev2setup.sh "$gi/ikev2setup" $wg vpnupgrade.sh "$gi/vpnupgrade" $wg vpnupgrade_centos.sh "$gi/vpnupgrade-centos" @@ -68,6 +69,7 @@ jobs: diff vpnsetup_ubuntu.sh ../vpnsetup_ubuntu.sh diff vpnsetup_alpine.sh ../vpnsetup_alpine.sh diff quickstart.sh ../extras/quickstart.sh + diff quickstart_.sh ../extras/quickstart.sh diff ikev2setup.sh ../extras/ikev2setup.sh diff vpnupgrade.sh ../extras/vpnupgrade.sh diff vpnupgrade_centos.sh ../extras/vpnupgrade_centos.sh diff --git a/.github/workflows/test_set_1.yml b/.github/workflows/test_set_1.yml index 728fe46..cb4ff2e 100644 --- a/.github/workflows/test_set_1.yml +++ b/.github/workflows/test_set_1.yml @@ -22,11 +22,19 @@ jobs: env: OS_VERSION: ${{ matrix.os_version }} steps: + - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # 2.4.0 + with: + persist-credentials: false - name: Build run: | mkdir -p "$GITHUB_WORKSPACE/testing/${OS_VERSION//:}" cd "$GITHUB_WORKSPACE/testing/${OS_VERSION//:}" + mkdir -p scripts/extras + ls -ld "$GITHUB_WORKSPACE/vpnsetup.sh" + cp -f "$GITHUB_WORKSPACE"/*.sh scripts/ + cp -f "$GITHUB_WORKSPACE"/extras/*.sh scripts/extras/ + cat > run.sh <<'EOF' #!/bin/bash set -eEx @@ -71,11 +79,12 @@ jobs: echo } + cd /opt/src yum -y -q update yum -y -q install wget rsyslog systemctl start rsyslog - wget -t 3 -T 30 -nv -O vpnsetup.sh https://git.io/vpnsetup + cp -f /opt/src/scripts/vpnsetup.sh . sed -i '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpn.sh"' vpnsetup.sh sh vpnsetup.sh @@ -102,7 +111,7 @@ jobs: ls -l /usr/bin/ikev2.sh ls -l /opt/src/ikev2.sh - wget -t 3 -T 30 -nv -O vpnunst.sh https://git.io/vpnuninstall + cp -f /opt/src/scripts/extras/vpnuninstall.sh ./vpnunst.sh bash vpnunst.sh < run.sh if [ "$os_type" = "alpine" ]; then @@ -83,7 +87,7 @@ jobs: service rsyslog start fi - wget -t 3 -T 30 -nv -O vpnsetup.sh https://git.io/vpnsetup + cp -f "$GITHUB_WORKSPACE"/vpnsetup.sh . sed -i '/curl /a sed -i "/swan_ver_latest=/s/^/#/" "$tmpdir/vpn.sh"' vpnsetup.sh sh vpnsetup.sh @@ -115,7 +119,7 @@ jobs: ls -l /usr/bin/ikev2.sh ls -l /opt/src/ikev2.sh - wget -t 3 -T 30 -nv -O vpnunst.sh https://git.io/vpnuninstall + cp -f "$GITHUB_WORKSPACE"/extras/vpnuninstall.sh ./vpnunst.sh bash vpnunst.sh <