From 20e30373435983ad58468e94acdfa7e6d30e8b3e Mon Sep 17 00:00:00 2001 From: lss233 <8984680+lss233@users.noreply.github.com> Date: Thu, 11 May 2023 11:11:59 +0800 Subject: [PATCH] ci: supress exception on downloading cloudflare --- .github/workflows/quickstart-windows-dev-gocqhttp.yml | 11 +++++++---- .github/workflows/quickstart-windows-dev-mirai.yaml | 8 +++++--- .github/workflows/quickstart-windows-gocqhttp.yml | 1 + .github/workflows/quickstart-windows-mirai.yml | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/quickstart-windows-dev-gocqhttp.yml b/.github/workflows/quickstart-windows-dev-gocqhttp.yml index ca110155..ce0837bb 100644 --- a/.github/workflows/quickstart-windows-dev-gocqhttp.yml +++ b/.github/workflows/quickstart-windows-dev-gocqhttp.yml @@ -1,4 +1,4 @@ -name: Windows Quickstart Dev (Mirai) +name: Windows Quickstart Dev (go-cqhttp) on: workflow_dispatch: @@ -68,11 +68,14 @@ jobs: cd C:/generated_files/chatgpt ..\python3.11\python.exe C:/generated_files/python3.11/get-pip.py ..\python3.11\python.exe -m pip install -r requirements.txt - ..\python3.11\python.exe -c "from pycloudflared import try_cloudflare; try_cloudflare(-1)" + ..\python3.11\python.exe -c exec("""from pycloudflared import try_cloudflare \ntry: try_cloudflare(-1)\nexcept:... """) + + echo "Packing..." + cd C:/generated_files + 7z a quickstart-windows-go-cqhttp-amd64.zip C:\generated_files\* - name: Archive production artifacts uses: actions/upload-artifact@v3 with: name: quickstart-windows-go-cqhttp-amd64.zip path: | - C:\generated_files\ - + C:\generated_files\quickstart-windows-go-cqhttp-amd64.zip diff --git a/.github/workflows/quickstart-windows-dev-mirai.yaml b/.github/workflows/quickstart-windows-dev-mirai.yaml index 20a423ae..cb38bc4b 100644 --- a/.github/workflows/quickstart-windows-dev-mirai.yaml +++ b/.github/workflows/quickstart-windows-dev-mirai.yaml @@ -86,11 +86,13 @@ jobs: cd C:/generated_files/chatgpt ..\python3.11\python.exe C:/generated_files/python3.11/get-pip.py ..\python3.11\python.exe -m pip install -r requirements.txt - ..\python3.11\python.exe -c "from pycloudflared import try_cloudflare; try_cloudflare(-1)" + ..\python3.11\python.exe -c exec("""from pycloudflared import try_cloudflare \ntry: try_cloudflare(-1)\nexcept:... """) + echo "Packing..." + cd C:/generated_files + 7z a quickstart-windows-mirai-amd64.zip C:\generated_files\* - name: Archive production artifacts uses: actions/upload-artifact@v3 with: name: quickstart-windows-mirai-amd64.zip path: | - C:\generated_files\ - + C:\generated_files\quickstart-windows-mirai-amd64.zip diff --git a/.github/workflows/quickstart-windows-gocqhttp.yml b/.github/workflows/quickstart-windows-gocqhttp.yml index 5e892c4b..b8f2fdf8 100644 --- a/.github/workflows/quickstart-windows-gocqhttp.yml +++ b/.github/workflows/quickstart-windows-gocqhttp.yml @@ -63,6 +63,7 @@ jobs: cd C:/generated_files/chatgpt ..\python3.11\python.exe C:/generated_files/python3.11/get-pip.py ..\python3.11\python.exe -m pip install -r requirements.txt + ..\python3.11\python.exe -c exec("""from pycloudflared import try_cloudflare \ntry: try_cloudflare(-1)\nexcept:... """) echo "Packing..." cd C:/generated_files diff --git a/.github/workflows/quickstart-windows-mirai.yml b/.github/workflows/quickstart-windows-mirai.yml index 0e9e5e62..5f5d592c 100644 --- a/.github/workflows/quickstart-windows-mirai.yml +++ b/.github/workflows/quickstart-windows-mirai.yml @@ -81,7 +81,7 @@ jobs: cd C:/generated_files/chatgpt ..\python3.11\python.exe C:/generated_files/python3.11/get-pip.py ..\python3.11\python.exe -m pip install -r requirements.txt - ..\python3.11\python.exe -c "from pycloudflared import try_cloudflare; try_cloudflare(-1)" + ..\python3.11\python.exe -c exec("""from pycloudflared import try_cloudflare \ntry: try_cloudflare(-1)\nexcept:... """) echo "Packing..." cd C:/generated_files