Merge pull request #3141 from acmesh-official/dev

sync

.github/workflows/LetsEncrypt.yml

@@ -11,6 +11,7 @@ on:
       - dev
     paths:
       - '**.sh'
+      - '**.yml'
 
 
 jobs:
@@ -46,7 +47,7 @@ jobs:
     - name: Clone acmetest
       run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
     - name: Run acmetest
-      run: cd ../acmetest && sudo TEST_LOCAL="$TEST_LOCAL" NGROK_TOKEN="$NGROK_TOKEN" ./letest.sh
+      run: cd ../acmetest && sudo --preserve-env ./letest.sh
 
   MacOS:
     runs-on: macos-latest
@@ -61,7 +62,7 @@ jobs:
     - name: Clone acmetest
       run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
     - name: Run acmetest
-      run: cd ../acmetest && sudo TEST_LOCAL="$TEST_LOCAL" NGROK_TOKEN="$NGROK_TOKEN" ./letest.sh
+      run: cd ../acmetest && sudo --preserve-env ./letest.sh
 
   Windows:
     runs-on: windows-latest
@@ -72,6 +73,9 @@ jobs:
       #The 80 port is used by Windows server, we have to use a custom port, ngrok will also use this port.
       Le_HTTPPort: 8888
     steps:
+    - name: Set git to use LF
+      run: |
+          git config --global core.autocrlf false
     - uses: actions/checkout@v2
     - name: Install cygwin base packages with chocolatey
       run: |
@@ -87,7 +91,7 @@ jobs:
           echo '::set-env name=PATH::C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin'
     - name: Clone acmetest
       shell: cmd
-      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/ && sed -i 's/\r//g' acmetest/acme.sh/acme.sh
+      run: cd .. && git clone https://github.com/acmesh-official/acmetest.git  && cp -r acme.sh acmetest/
     - name: Run acmetest
       shell: cmd
       run: cd ../acmetest && bash.exe -c ./letest.sh

.github/workflows/PebbleStrict.yml

@@ -5,11 +5,13 @@ on:
       - '*'
     paths:
       - '**.sh'
+      - '**.yml'
   pull_request:
     branches:
       - dev
     paths:
       - '**.sh'
+      - '**.yml'
 
 jobs:
   PebbleStrict:

.github/workflows/shellcheck.yml

@@ -5,14 +5,16 @@ on:
       - '*'
     paths:
       - '**.sh'
+      - '**.yml'
   pull_request:
     branches:
       - dev
     paths:
       - '**.sh'
+      - '**.yml'
 
 jobs:
-  formatCheck:
+  ShellCheck:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -20,6 +22,11 @@ jobs:
       run: sudo apt-get install -y shellcheck
     - name: DoShellcheck
       run: shellcheck -V  && shellcheck -e SC2181 **/*.sh && echo "shellcheck OK"
+
+  shfmt:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
     - name: Install shfmt
       run: curl -sSL https://github.com/mvdan/sh/releases/download/v3.1.2/shfmt_v3.1.2_linux_amd64 -o ~/shfmt && chmod +x ~/shfmt
     - name: shfmt

acme.sh

@@ -4978,7 +4978,7 @@ $_authorizations_map"
   fi
 }
 
-#in_out_cert   out_fullchain out out_ca
+#in_out_cert   out_fullchain   out_ca
 _split_cert_chain() {
   _certf="$1"
   _fullchainf="$2"