ci: supress exception on downloading cloudflare

lss233 · May 11, 2023 · 20e3037 · 20e3037
1 parent f90420d
commit 20e3037
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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