update ci

jaredtao · Dec 18, 2020 · 6a5ccd9 · 6a5ccd9
1 parent fa91d11
commit 6a5ccd9
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 37 deletions.
diff --git a/.github/workflows/macos-11_0.yml b/.github/workflows/macos-11_0.yml
@@ -49,19 +49,19 @@ jobs:
           qmake
           make
       # tag 打包
-      - name: package
-        if: startsWith(github.event.ref, 'refs/tags/')
-        run: |
-          # 拷贝依赖
-          macdeployqt bin/release/${targetName}.app -qmldir=. -verbose=1 -dmg
+      # - name: package
+      #   if: startsWith(github.event.ref, 'refs/tags/')
+      #   run: |
+      #     # 拷贝依赖
+      #     macdeployqt bin/release/${targetName}.app -qmldir=. -verbose=1 -dmg
 
-      # tag 上传Release
-      - name: uploadRelease
-        if: startsWith(github.event.ref, 'refs/tags/')
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: bin/release/${{ env.targetName }}.dmg
-          asset_name: ${{ env.targetName }}-${{ matrix.os }}-${{ matrix.qt_ver }}.dmg
-          tag: ${{ github.ref }}
-          overwrite: true
+      # # tag 上传Release
+      # - name: uploadRelease
+      #   if: startsWith(github.event.ref, 'refs/tags/')
+      #   uses: svenstaro/upload-release-action@v2
+      #   with:
+      #     repo_token: ${{ secrets.GITHUB_TOKEN }}
+      #     file: bin/release/${{ env.targetName }}.dmg
+      #     asset_name: ${{ env.targetName }}-${{ matrix.os }}-${{ matrix.qt_ver }}.dmg
+      #     tag: ${{ github.ref }}
+      #     overwrite: true
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -50,7 +50,11 @@ jobs:
         run: |
           # 拷贝依赖
           macdeployqt bin/release/${targetName}.app -qmldir=. -verbose=1 -dmg
-
+      # 上传artifacts          
+      - uses: actions/upload-artifact@v2
+        with:
+          name: ${targetName}.zip
+          path: bin/release/${targetName}.app
       # tag 上传Release
       - name: uploadRelease
         if: startsWith(github.event.ref, 'refs/tags/')

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -60,6 +60,7 @@ jobs:
             qt_arch_install: msvc2019_64          
     env:
       targetName: TaoQuickShow.exe
+      VCINSTALLDIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC'
     # 步骤
     steps:
       # 安装Qt
@@ -81,10 +82,8 @@ jobs:
       # 编译msvc
       - name: build-msvc
         shell: cmd
-        env:
-          vc_arch: ${{ matrix.msvc_arch }}
         run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" %vc_arch%
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.msvc_arch }}
           qmake
           nmake
       # tag 打包
@@ -96,26 +95,15 @@ jobs:
           archiveName: ${{ matrix.qt_ver }}-${{ matrix.qt_arch }}
         shell: pwsh
         run: |
-          # 创建文件夹
-          New-Item -ItemType Directory ${env:archiveName}
-          # 拷贝exe
-          Copy-Item bin\release\${env:targetName} ${env:archiveName}\
-          Copy-Item bin\release\Trans ${env:archiveName}\Trans -Recurse
-          # 拷贝依赖
-          windeployqt --qmldir . ${env:archiveName}\${env:targetName}
-          # 删除不必要的库
-          $excludeList=@("*.qmlc", "*.ilk", "*.exp", "*.lib", "*.pdb")
-          Remove-Item -Path Qml -Include $excludeList -Recurse -Force
-          # 打包zip
-          Compress-Archive -Path ${env:archiveName} ${env:archiveName}'.zip'
+          & scripts\windows-publish.ps1 ${env.archiveName} ${env.targetName}
           # 记录packageName给后续step
-          $name = ${env:archiveName}
-          echo "::set-output name=packageName::$name"
+           $name = ${env:archiveName}
+           echo "::set-output name=packageName::$name"
       # 上传artifacts          
-      # - uses: actions/upload-artifact@v2
-      #   with:
-      #     name: ${{ steps.package.outputs.packageName }}
-      #     path: ${{ steps.package.outputs.packageName }}.zip
+      - uses: actions/upload-artifact@v2
+        with:
+          name: ${{ steps.package.outputs.packageName }}
+          path: ${{ steps.package.outputs.packageName }}.zip
       # tag 上传Release
       - name: uploadRelease
         if: startsWith(github.event.ref, 'refs/tags/')

diff --git a/scripts/windows-publish.ps1 b/scripts/windows-publish.ps1
@@ -0,0 +1,31 @@
+$scriptDir=$PSScriptRoot
+$currentDir=Get-Location
+Write-Host "currentDir" $currentDir
+Write-Host "scriptDir" $scriptDir
+
+
+function Main() {
+    if ($args.Length -le 1 ) {
+        Write-Host "args missing, need at last 2, real " $args.Length
+        return
+    }
+
+    [string]$archiveName=$args[0]
+    [string]$targetName=$args[1]
+
+    New-Item -ItemType Directory $archiveName
+    # 拷贝exe
+    Copy-Item bin\release\$targetName $archiveName\
+    Copy-Item bin\release\Trans $archiveName\Trans -Recurse
+    # 拷贝依赖
+    windeployqt --qmldir . $archiveName\$targetName
+    # 删除不必要的库
+    #$excludeList = @("*.qmlc", "*.ilk", "*.exp", "*.lib", "*.pdb")
+    #Remove-Item -Path Qml -Include $excludeList -Recurse -Force
+    # 打包zip
+    Compress-Archive -Path $archiveName $archiveName'.zip'
+}
+
+Main $args
+
+