split in to multiple files, so that it can pass more.

diff --git a/.github/workflows/FreeBSD.yml b/.github/workflows/FreeBSD.yml
new file mode 100644 (file)
index 0000000..dd80a0b
--- /dev/null
+++ b/.github/workflows/FreeBSD.yml
@@ -0,0 +1,60 @@
+name: FreeBSD\r
+on:\r
+  push:\r
+    branches:\r
+      - '*'\r
+    paths:\r
+      - '*.sh'\r
+      - '**.yml'\r
+\r
+  pull_request:\r
+    branches:\r
+      - dev\r
+    paths:\r
+      - '*.sh'\r
+      - '**.yml'\r
+\r
+\r
+jobs:\r
+  FreeBSD:\r
+    strategy:\r
+      matrix:\r
+        include:\r
+         - TEST_ACME_Server: ""\r
+           CA_ECDSA: ""\r
+           CA: ""\r
+           CA_EMAIL: ""\r
+         - TEST_ACME_Server: "https://acme.zerossl.com/v2/DV90"\r
+           CA_ECDSA: "ZeroSSL ECC Domain Secure Site CA"\r
+           CA: "ZeroSSL RSA Domain Secure Site CA"\r
+           CA_EMAIL: "githubtest@acme.sh"\r
+    runs-on: macos-latest\r
+    env:\r
+      TEST_LOCAL: 1\r
+      ACME_DIRECTORY: ${{ matrix.TEST_ACME_Server }}\r
+      CA_ECDSA: ${{ matrix.CA_ECDSA }}\r
+      CA: ${{ matrix.CA }}\r
+      CA_EMAIL: ${{ matrix.CA_EMAIL }}\r
+    steps:\r
+    - uses: actions/checkout@v2\r
+    - uses: vmactions/cf-tunnel@v0.0.2\r
+      id: tunnel\r
+      with:\r
+        protocol: http\r
+        port: 8080\r
+    - name: Set envs\r
+      run: echo "TestingDomain=${{steps.tunnel.outputs.server}}" >> $GITHUB_ENV\r
+    - name: Clone acmetest\r
+      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/\r
+    - uses: vmactions/freebsd-vm@v0.1.4\r
+      with:\r
+        envs: 'TEST_LOCAL TestingDomain ACME_DIRECTORY CA_ECDSA CA CA_EMAIL'\r
+        nat: |\r
+          "8080": "80"\r
+        prepare: pkg install -y socat curl\r
+        usesh: true\r
+        run: |\r
+          cd ../acmetest \\r
+          && ./letest.sh\r
+\r
+\r

diff --git a/.github/workflows/LetsEncrypt.yml b/.github/workflows/LetsEncrypt.yml
deleted file mode 100644 (file)
index 5986290..0000000
--- a/.github/workflows/LetsEncrypt.yml
+++ /dev/null
@@ -1,215 +0,0 @@
-name: LetsEncrypt\r
-on:\r
-  push:\r
-    branches:\r
-      - '*'\r
-    paths:\r
-      - '*.sh'\r
-      - '**.yml'\r
-\r
-  pull_request:\r
-    branches:\r
-      - dev\r
-    paths:\r
-      - '*.sh'\r
-      - '**.yml'\r
-\r
-\r
-jobs:\r
-  Ubuntu:\r
-    strategy:\r
-      matrix:\r
-        include:\r
-         - TEST_ACME_Server: ""\r
-           CA_ECDSA: ""\r
-           CA: ""\r
-           CA_EMAIL: ""\r
-         - TEST_ACME_Server: "https://acme.zerossl.com/v2/DV90"\r
-           CA_ECDSA: "ZeroSSL ECC Domain Secure Site CA"\r
-           CA: "ZeroSSL RSA Domain Secure Site CA"\r
-           CA_EMAIL: "githubtest@acme.sh"\r
-    runs-on: ubuntu-latest\r
-    env:\r
-      TEST_LOCAL: 1\r
-      ACME_DIRECTORY: ${{ matrix.TEST_ACME_Server }}\r
-      CA_ECDSA: ${{ matrix.CA_ECDSA }}\r
-      CA: ${{ matrix.CA }}\r
-      CA_EMAIL: ${{ matrix.CA_EMAIL }}\r
-    steps:\r
-    - uses: actions/checkout@v2\r
-    - name: Install tools\r
-      run: sudo apt-get install -y socat\r
-    - name: Clone acmetest\r
-      run: |\r
-          cd .. \\r
-          && git clone https://github.com/acmesh-official/acmetest.git \\r
-          && cp -r acme.sh acmetest/\r
-    - name: Run acmetest\r
-      run: |\r
-          cd ../acmetest \\r
-          && sudo --preserve-env ./letest.sh\r
-\r
-  MacOS:\r
-    strategy:\r
-      matrix:\r
-        include:\r
-         - TEST_ACME_Server: ""\r
-           CA_ECDSA: ""\r
-           CA: ""\r
-           CA_EMAIL: ""\r
-         - TEST_ACME_Server: "https://acme.zerossl.com/v2/DV90"\r
-           CA_ECDSA: "ZeroSSL ECC Domain Secure Site CA"\r
-           CA: "ZeroSSL RSA Domain Secure Site CA"\r
-           CA_EMAIL: "githubtest@acme.sh"\r
-    runs-on: macos-latest\r
-    env:\r
-      TEST_LOCAL: 1\r
-      ACME_DIRECTORY: ${{ matrix.TEST_ACME_Server }}\r
-      CA_ECDSA: ${{ matrix.CA_ECDSA }}\r
-      CA: ${{ matrix.CA }}\r
-      CA_EMAIL: ${{ matrix.CA_EMAIL }}\r
-    steps:\r
-    - uses: actions/checkout@v2\r
-    - name: Install tools\r
-      run:  brew install socat\r
-    - name: Clone acmetest\r
-      run: |\r
-          cd .. \\r
-          && git clone https://github.com/acmesh-official/acmetest.git \\r
-          && cp -r acme.sh acmetest/\r
-    - name: Run acmetest\r
-      run: |\r
-          cd ../acmetest \\r
-          && sudo --preserve-env ./letest.sh\r
-\r
-  Windows:\r
-    strategy:\r
-      matrix:\r
-        include:\r
-         - TEST_ACME_Server: ""\r
-           CA_ECDSA: ""\r
-           CA: ""\r
-           CA_EMAIL: ""\r
-         - TEST_ACME_Server: "https://acme.zerossl.com/v2/DV90"\r
-           CA_ECDSA: "ZeroSSL ECC Domain Secure Site CA"\r
-           CA: "ZeroSSL RSA Domain Secure Site CA"\r
-           CA_EMAIL: "githubtest@acme.sh"\r
-    runs-on: windows-latest\r
-    env:\r
-      ACME_DIRECTORY: ${{ matrix.TEST_ACME_Server }}\r
-      CA_ECDSA: ${{ matrix.CA_ECDSA }}\r
-      CA: ${{ matrix.CA }}\r
-      CA_EMAIL: ${{ matrix.CA_EMAIL }}\r
-      TEST_LOCAL: 1\r
-      #The 80 port is used by Windows server, we have to use a custom port, tunnel will also use this port.\r
-      Le_HTTPPort: 8888\r
-    steps:\r
-    - name: Set git to use LF\r
-      run: |\r
-          git config --global core.autocrlf false\r
-    - uses: actions/checkout@v2\r
-    - name: Install cygwin base packages with chocolatey\r
-      run: |\r
-          choco config get cacheLocation\r
-          choco install --no-progress cygwin\r
-      shell: cmd\r
-    - name: Install cygwin additional packages\r
-      run: |\r
-          C:\tools\cygwin\cygwinsetup.exe -qgnNdO -R C:/tools/cygwin -s http://mirrors.kernel.org/sourceware/cygwin/ -P socat,curl,cron,unzip,git\r
-      shell: cmd\r
-    - name: Set ENV\r
-      shell: cmd\r
-      run: |\r
-          echo PATH=C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin >> %GITHUB_ENV%\r
-    - name: Check ENV\r
-      shell: cmd\r
-      run: |\r
-          echo "PATH=%PATH%"\r
-    - name: Clone acmetest\r
-      shell: cmd\r
-      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/\r
-    - name: Run acmetest\r
-      shell: cmd\r
-      run: cd ../acmetest && bash.exe -c ./letest.sh\r
-\r
-  FreeBSD:\r
-    strategy:\r
-      matrix:\r
-        include:\r
-         - TEST_ACME_Server: ""\r
-           CA_ECDSA: ""\r
-           CA: ""\r
-           CA_EMAIL: ""\r
-         - TEST_ACME_Server: "https://acme.zerossl.com/v2/DV90"\r
-           CA_ECDSA: "ZeroSSL ECC Domain Secure Site CA"\r
-           CA: "ZeroSSL RSA Domain Secure Site CA"\r
-           CA_EMAIL: "githubtest@acme.sh"\r
-    runs-on: macos-latest\r
-    env:\r
-      TEST_LOCAL: 1\r
-      ACME_DIRECTORY: ${{ matrix.TEST_ACME_Server }}\r
-      CA_ECDSA: ${{ matrix.CA_ECDSA }}\r
-      CA: ${{ matrix.CA }}\r
-      CA_EMAIL: ${{ matrix.CA_EMAIL }}\r
-    steps:\r
-    - uses: actions/checkout@v2\r
-    - uses: vmactions/cf-tunnel@v0.0.2\r
-      id: tunnel\r
-      with:\r
-        protocol: http\r
-        port: 8080\r
-    - name: Set envs\r
-      run: echo "TestingDomain=${{steps.tunnel.outputs.server}}" >> $GITHUB_ENV\r
-    - name: Clone acmetest\r
-      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/\r
-    - uses: vmactions/freebsd-vm@v0.1.4\r
-      with:\r
-        envs: 'TEST_LOCAL TestingDomain ACME_DIRECTORY CA_ECDSA CA CA_EMAIL'\r
-        nat: |\r
-          "8080": "80"\r
-        prepare: pkg install -y socat curl\r
-        usesh: true\r
-        run: |\r
-          cd ../acmetest \\r
-          && ./letest.sh\r
-\r
-  Solaris:\r
-    strategy:\r
-      matrix:\r
-        include:\r
-         - TEST_ACME_Server: ""\r
-           CA_ECDSA: ""\r
-           CA: ""\r
-           CA_EMAIL: ""\r
-         - TEST_ACME_Server: "https://acme.zerossl.com/v2/DV90"\r
-           CA_ECDSA: "ZeroSSL ECC Domain Secure Site CA"\r
-           CA: "ZeroSSL RSA Domain Secure Site CA"\r
-           CA_EMAIL: "githubtest@acme.sh"\r
-    runs-on: macos-latest\r
-    env:\r
-      TEST_LOCAL: 1\r
-      ACME_DIRECTORY: ${{ matrix.TEST_ACME_Server }}\r
-      CA_ECDSA: ${{ matrix.CA_ECDSA }}\r
-      CA: ${{ matrix.CA }}\r
-      CA_EMAIL: ${{ matrix.CA_EMAIL }}\r
-    steps:\r
-    - uses: actions/checkout@v2\r
-    - uses: vmactions/cf-tunnel@v0.0.2\r
-      id: tunnel\r
-      with:\r
-        protocol: http\r
-        port: 8080\r
-    - name: Set envs\r
-      run: echo "TestingDomain=${{steps.tunnel.outputs.server}}" >> $GITHUB_ENV\r
-    - name: Clone acmetest\r
-      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/\r
-    - uses: vmactions/solaris-vm@v0.0.3\r
-      with:\r
-        envs: 'TEST_LOCAL TestingDomain ACME_DIRECTORY CA_ECDSA CA CA_EMAIL'\r
-        nat: |\r
-          "8080": "80"\r
-        prepare: pkgutil -y -i socat curl\r
-        run: |\r
-          cd ../acmetest \\r
-          && ./letest.sh\r
-\r

diff --git a/.github/workflows/MacOS.yml b/.github/workflows/MacOS.yml
new file mode 100644 (file)
index 0000000..b03bec0
--- /dev/null
+++ b/.github/workflows/MacOS.yml
@@ -0,0 +1,52 @@
+name: MacOS\r
+on:\r
+  push:\r
+    branches:\r
+      - '*'\r
+    paths:\r
+      - '*.sh'\r
+      - '**.yml'\r
+\r
+  pull_request:\r
+    branches:\r
+      - dev\r
+    paths:\r
+      - '*.sh'\r
+      - '**.yml'\r
+\r
+\r
+jobs:\r
+  MacOS:\r
+    strategy:\r
+      matrix:\r
+        include:\r
+         - TEST_ACME_Server: ""\r
+           CA_ECDSA: ""\r
+           CA: ""\r
+           CA_EMAIL: ""\r
+         - TEST_ACME_Server: "https://acme.zerossl.com/v2/DV90"\r
+           CA_ECDSA: "ZeroSSL ECC Domain Secure Site CA"\r
+           CA: "ZeroSSL RSA Domain Secure Site CA"\r
+           CA_EMAIL: "githubtest@acme.sh"\r
+    runs-on: macos-latest\r
+    env:\r
+      TEST_LOCAL: 1\r
+      ACME_DIRECTORY: ${{ matrix.TEST_ACME_Server }}\r
+      CA_ECDSA: ${{ matrix.CA_ECDSA }}\r
+      CA: ${{ matrix.CA }}\r
+      CA_EMAIL: ${{ matrix.CA_EMAIL }}\r
+    steps:\r
+    - uses: actions/checkout@v2\r
+    - name: Install tools\r
+      run:  brew install socat\r
+    - name: Clone acmetest\r
+      run: |\r
+          cd .. \\r
+          && git clone https://github.com/acmesh-official/acmetest.git \\r
+          && cp -r acme.sh acmetest/\r
+    - name: Run acmetest\r
+      run: |\r
+          cd ../acmetest \\r
+          && sudo --preserve-env ./letest.sh\r
+\r
+\r

diff --git a/.github/workflows/Solaris.yml b/.github/workflows/Solaris.yml
new file mode 100644 (file)
index 0000000..ad976f5
--- /dev/null
+++ b/.github/workflows/Solaris.yml
@@ -0,0 +1,58 @@
+name: Solaris\r
+on:\r
+  push:\r
+    branches:\r
+      - '*'\r
+    paths:\r
+      - '*.sh'\r
+      - '**.yml'\r
+\r
+  pull_request:\r
+    branches:\r
+      - dev\r
+    paths:\r
+      - '*.sh'\r
+      - '**.yml'\r
+\r
+\r
+jobs:\r
+  Solaris:\r
+    strategy:\r
+      matrix:\r
+        include:\r
+         - TEST_ACME_Server: ""\r
+           CA_ECDSA: ""\r
+           CA: ""\r
+           CA_EMAIL: ""\r
+         - TEST_ACME_Server: "https://acme.zerossl.com/v2/DV90"\r
+           CA_ECDSA: "ZeroSSL ECC Domain Secure Site CA"\r
+           CA: "ZeroSSL RSA Domain Secure Site CA"\r
+           CA_EMAIL: "githubtest@acme.sh"\r
+    runs-on: macos-latest\r
+    env:\r
+      TEST_LOCAL: 1\r
+      ACME_DIRECTORY: ${{ matrix.TEST_ACME_Server }}\r
+      CA_ECDSA: ${{ matrix.CA_ECDSA }}\r
+      CA: ${{ matrix.CA }}\r
+      CA_EMAIL: ${{ matrix.CA_EMAIL }}\r
+    steps:\r
+    - uses: actions/checkout@v2\r
+    - uses: vmactions/cf-tunnel@v0.0.2\r
+      id: tunnel\r
+      with:\r
+        protocol: http\r
+        port: 8080\r
+    - name: Set envs\r
+      run: echo "TestingDomain=${{steps.tunnel.outputs.server}}" >> $GITHUB_ENV\r
+    - name: Clone acmetest\r
+      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/\r
+    - uses: vmactions/solaris-vm@v0.0.3\r
+      with:\r
+        envs: 'TEST_LOCAL TestingDomain ACME_DIRECTORY CA_ECDSA CA CA_EMAIL'\r
+        nat: |\r
+          "8080": "80"\r
+        prepare: pkgutil -y -i socat curl\r
+        run: |\r
+          cd ../acmetest \\r
+          && ./letest.sh\r
+\r

diff --git a/.github/workflows/Ubuntu.yml b/.github/workflows/Ubuntu.yml
new file mode 100644 (file)
index 0000000..1ec5018
--- /dev/null
+++ b/.github/workflows/Ubuntu.yml
@@ -0,0 +1,52 @@
+name: Ubuntu\r
+on:\r
+  push:\r
+    branches:\r
+      - '*'\r
+    paths:\r
+      - '*.sh'\r
+      - '**.yml'\r
+\r
+  pull_request:\r
+    branches:\r
+      - dev\r
+    paths:\r
+      - '*.sh'\r
+      - '**.yml'\r
+\r
+\r
+jobs:\r
+  Ubuntu:\r
+    strategy:\r
+      matrix:\r
+        include:\r
+         - TEST_ACME_Server: ""\r
+           CA_ECDSA: ""\r
+           CA: ""\r
+           CA_EMAIL: ""\r
+         - TEST_ACME_Server: "https://acme.zerossl.com/v2/DV90"\r
+           CA_ECDSA: "ZeroSSL ECC Domain Secure Site CA"\r
+           CA: "ZeroSSL RSA Domain Secure Site CA"\r
+           CA_EMAIL: "githubtest@acme.sh"\r
+    runs-on: ubuntu-latest\r
+    env:\r
+      TEST_LOCAL: 1\r
+      ACME_DIRECTORY: ${{ matrix.TEST_ACME_Server }}\r
+      CA_ECDSA: ${{ matrix.CA_ECDSA }}\r
+      CA: ${{ matrix.CA }}\r
+      CA_EMAIL: ${{ matrix.CA_EMAIL }}\r
+    steps:\r
+    - uses: actions/checkout@v2\r
+    - name: Install tools\r
+      run: sudo apt-get install -y socat\r
+    - name: Clone acmetest\r
+      run: |\r
+          cd .. \\r
+          && git clone https://github.com/acmesh-official/acmetest.git \\r
+          && cp -r acme.sh acmetest/\r
+    - name: Run acmetest\r
+      run: |\r
+          cd ../acmetest \\r
+          && sudo --preserve-env ./letest.sh\r
+\r
+\r

diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml
new file mode 100644 (file)
index 0000000..0219eaa
--- /dev/null
+++ b/.github/workflows/Windows.yml
@@ -0,0 +1,70 @@
+name: Windows\r
+on:\r
+  push:\r
+    branches:\r
+      - '*'\r
+    paths:\r
+      - '*.sh'\r
+      - '**.yml'\r
+\r
+  pull_request:\r
+    branches:\r
+      - dev\r
+    paths:\r
+      - '*.sh'\r
+      - '**.yml'\r
+\r
+\r
+jobs:\r
+  Windows:\r
+    strategy:\r
+      matrix:\r
+        include:\r
+         - TEST_ACME_Server: ""\r
+           CA_ECDSA: ""\r
+           CA: ""\r
+           CA_EMAIL: ""\r
+         - TEST_ACME_Server: "https://acme.zerossl.com/v2/DV90"\r
+           CA_ECDSA: "ZeroSSL ECC Domain Secure Site CA"\r
+           CA: "ZeroSSL RSA Domain Secure Site CA"\r
+           CA_EMAIL: "githubtest@acme.sh"\r
+    runs-on: windows-latest\r
+    env:\r
+      ACME_DIRECTORY: ${{ matrix.TEST_ACME_Server }}\r
+      CA_ECDSA: ${{ matrix.CA_ECDSA }}\r
+      CA: ${{ matrix.CA }}\r
+      CA_EMAIL: ${{ matrix.CA_EMAIL }}\r
+      TEST_LOCAL: 1\r
+      #The 80 port is used by Windows server, we have to use a custom port, tunnel will also use this port.\r
+      Le_HTTPPort: 8888\r
+    steps:\r
+    - name: Set git to use LF\r
+      run: |\r
+          git config --global core.autocrlf false\r
+    - uses: actions/checkout@v2\r
+    - name: Install cygwin base packages with chocolatey\r
+      run: |\r
+          choco config get cacheLocation\r
+          choco install --no-progress cygwin\r
+      shell: cmd\r
+    - name: Install cygwin additional packages\r
+      run: |\r
+          C:\tools\cygwin\cygwinsetup.exe -qgnNdO -R C:/tools/cygwin -s http://mirrors.kernel.org/sourceware/cygwin/ -P socat,curl,cron,unzip,git\r
+      shell: cmd\r
+    - name: Set ENV\r
+      shell: cmd\r
+      run: |\r
+          echo PATH=C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin >> %GITHUB_ENV%\r
+    - name: Check ENV\r
+      shell: cmd\r
+      run: |\r
+          echo "PATH=%PATH%"\r
+    - name: Clone acmetest\r
+      shell: cmd\r
+      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/\r
+    - name: Run acmetest\r
+      shell: cmd\r
+      run: cd ../acmetest && bash.exe -c ./letest.sh\r
+\r
+\r
+\r