Merge pull request #151 from NekoSilverFox/MengJianing

增加 CI/CD部分的 README 说明及英语文档
nekosilverfox · Oct 25, 2023 · 99d785e · 99d785e
2 parents be5c2e9 + 5a18857
commit 99d785e
Show file tree

Hide file tree

Showing 14 changed files with 1,756 additions and 131 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -12,7 +12,7 @@ on:
       - '.github/workflows/macos.yml' 
 jobs:
   build:
-    name: CICD
+    name: macOS-CI-CD
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -37,8 +37,9 @@ jobs:
         with:
           version: ${{ matrix.qt_ver }}
           cached: 'false'
-          #下面这几行不用也可以，删除不必要的控件能减少包体积
           aqtversion: '==3.1.*'
+          # host: 'mac'
+          #下面这几行不用也可以，删除不必要的控件能减少包体积
           # modules: 'qtnetworkauth'
           # tools: 'tools_qtcreator'
       - uses: actions/checkout@v2

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -1,4 +1,4 @@
-name: Windows CD/CD
+name: Windows CI/CD
 on: 
   # push代码时触发workflow
   push:
@@ -34,6 +34,7 @@ jobs:
             msvc_arch: x64
             qt_arch_install: msvc2019_64
     env:
+      targetName: PolyChat
       # 在 Qt pro 文件中的
       QtApplicationName: App.exe
     # 步骤
@@ -49,9 +50,10 @@ jobs:
           # target: ${{ matrix.qt_target }}
           arch: ${{ matrix.qt_arch }}
           cached: 'false'
+          # aqtversion: '==2.0.5'
           aqtversion: '==3.1.*'
-          #下面这几行不用也可以，删除不必要的控件能减少包体积
           # host: 'windows'
+          #下面这几行不用也可以，删除不必要的控件能减少包体积
           # target: 'desktop'
           # toolsOnly: 'true'
           # modules: 'qtnetworkauth'
@@ -108,7 +110,7 @@ jobs:
       # 上传artifacts
       - uses: actions/upload-artifact@v2
         with:
-          name: ${{ steps.package.outputs.packageName }}
+          name: ${{ env.targetName }}_${{ steps.package.outputs.packageName }}
           path: ${{ steps.package.outputs.packageName }}
       # tag 上传Release
       - name: uploadRelease
@@ -117,6 +119,6 @@ jobs:
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ steps.package.outputs.packageName }}.zip
-          asset_name: ${{ steps.package.outputs.packageName }}.zip
+          asset_name: ${{ env.targetName }}_${{ steps.package.outputs.packageName }}.zip
           tag: ${{ github.ref }}
           overwrite: true
diff --git a/PolyChat.pro b/PolyChat.pro
@@ -2,4 +2,4 @@ TEMPLATE = subdirs
 
 SUBDIRS += \
     App \
-#    Tester
+    Tester
diff --git a/README.md b/README.md
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,4 @@ TEMPLATE = subdirs @@
     SUBDIRS += \
         App \
-    #    Tester
+        Tester