From 41754c92c3125feaf7d9a8a8c8c998ebfa2957e3 Mon Sep 17 00:00:00 2001
From: neil <win10@neilpang.com>
Date: Sun, 30 Aug 2020 23:26:10 +0800
Subject: [PATCH 1/4] --preserve-env

---
 .github/workflows/LetsEncrypt.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/LetsEncrypt.yml b/.github/workflows/LetsEncrypt.yml
index 57948e3a..afa4da68 100644
--- a/.github/workflows/LetsEncrypt.yml
+++ b/.github/workflows/LetsEncrypt.yml
@@ -46,7 +46,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 +61,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

From d73438a3979b303d19b3669bf3d73bbef22eb8dd Mon Sep 17 00:00:00 2001
From: neil <win10@neilpang.com>
Date: Tue, 1 Sep 2020 21:30:56 +0800
Subject: [PATCH 2/4] update comments

---
 .github/workflows/LetsEncrypt.yml | 5 ++++-
 acme.sh                           | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/LetsEncrypt.yml b/.github/workflows/LetsEncrypt.yml
index afa4da68..5994fd9b 100644
--- a/.github/workflows/LetsEncrypt.yml
+++ b/.github/workflows/LetsEncrypt.yml
@@ -72,6 +72,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 +90,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
diff --git a/acme.sh b/acme.sh
index c36ce80e..4c9fa96e 100755
--- a/acme.sh
+++ b/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"

From d25b2890becb69edd2661d63074db0f6b450ab65 Mon Sep 17 00:00:00 2001
From: neil <win10@neilpang.com>
Date: Tue, 1 Sep 2020 21:34:44 +0800
Subject: [PATCH 3/4] split shellcheck

---
 .github/workflows/LetsEncrypt.yml | 2 +-
 .github/workflows/shellcheck.yml  | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/LetsEncrypt.yml b/.github/workflows/LetsEncrypt.yml
index 5994fd9b..16e42902 100644
--- a/.github/workflows/LetsEncrypt.yml
+++ b/.github/workflows/LetsEncrypt.yml
@@ -73,7 +73,7 @@ jobs:
       Le_HTTPPort: 8888
     steps:
     - name: Set git to use LF
-        run: |
+      run: |
           git config --global core.autocrlf false
     - uses: actions/checkout@v2
     - name: Install cygwin base packages with chocolatey
diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml
index 402492ad..099b9f7d 100644
--- a/.github/workflows/shellcheck.yml
+++ b/.github/workflows/shellcheck.yml
@@ -12,7 +12,7 @@ on:
       - '**.sh'
 
 jobs:
-  formatCheck:
+  ShellCheck:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -20,6 +20,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

From 1f5b6a6a35c25785cf4681462138630c00ba9b03 Mon Sep 17 00:00:00 2001
From: neil <win10@neilpang.com>
Date: Tue, 1 Sep 2020 21:39:44 +0800
Subject: [PATCH 4/4] fix filter to *.yml

---
 .github/workflows/LetsEncrypt.yml  | 1 +
 .github/workflows/PebbleStrict.yml | 2 ++
 .github/workflows/shellcheck.yml   | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/.github/workflows/LetsEncrypt.yml b/.github/workflows/LetsEncrypt.yml
index 16e42902..9a0175b5 100644
--- a/.github/workflows/LetsEncrypt.yml
+++ b/.github/workflows/LetsEncrypt.yml
@@ -11,6 +11,7 @@ on:
       - dev
     paths:
       - '**.sh'
+      - '**.yml'
 
 
 jobs:
diff --git a/.github/workflows/PebbleStrict.yml b/.github/workflows/PebbleStrict.yml
index ffc2ccdc..976e5373 100644
--- a/.github/workflows/PebbleStrict.yml
+++ b/.github/workflows/PebbleStrict.yml
@@ -5,11 +5,13 @@ on:
       - '*'
     paths:
       - '**.sh'
+      - '**.yml'
   pull_request:
     branches:
       - dev
     paths:
       - '**.sh'
+      - '**.yml'
 
 jobs:
   PebbleStrict:
diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml
index 099b9f7d..b22a2fd8 100644
--- a/.github/workflows/shellcheck.yml
+++ b/.github/workflows/shellcheck.yml
@@ -5,11 +5,13 @@ on:
       - '*'
     paths:
       - '**.sh'
+      - '**.yml'
   pull_request:
     branches:
       - dev
     paths:
       - '**.sh'
+      - '**.yml'
 
 jobs:
   ShellCheck: