合并build msvc (x86/x64)

.github/workflows/build.yml

@@ -17,6 +17,11 @@ jobs:
     strategy:
       matrix:
         qt_arch: [win64_msvc2017_64, win32_msvc2017]
+        include:
+          - qt_arch: win64_msvc2017_64
+            msvc_arch: x64
+          - qt_arch: win32_msvc2017
+            msvc_arch: x86
     steps:
       - name: Install Qt
         uses: jurplel/[email protected]
@@ -26,21 +31,13 @@ jobs:
       - uses: actions/checkout@v1
         with:
           fetch-depth: 1
-      - name: build-msvc-x64
-        if: contains(matrix.qt_arch,'msvc') && contains(matrix.qt_arch,'win64')
+      - name: build msvc
         shell: cmd
+        env:
+          vc_arch: ${{ matrix.msvc_arch }}
         run: |
           cd DIP-src
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-          qmake
-          nmake
-          windeployqt ../bin/
-      - name: build-msvc-x86
-        if: contains(matrix.qt_arch,'msvc') && contains(matrix.qt_arch,'win32')
-        shell: cmd
-        run: |
-          cd DIP-src
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" %vc_arch%
           qmake
           nmake
           windeployqt ../bin/