update actions

jaredtao · Jan 25, 2021 · 8f660c9 · 8f660c9
1 parent 8b2ea21
commit 8f660c9
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 19 deletions.
diff --git a/.github/workflows/android-qt5_15_2.yml b/.github/workflows/android-qt5_15_2.yml
@@ -31,7 +31,7 @@ jobs:
         qt_target: [android]
 
     steps:
-      - name: Install Qt 5.15.2
+      - name: Install Qt
         uses: jurplel/[email protected]
         with:
           # Version of Qt to install

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -31,7 +31,7 @@ jobs:
         qt_target: [android]
         qt_arch: [android_x86,android_armv7,android_arm64_v8a]
     steps:
-      - name: Install Qt 5.12.10
+      - name: Install Qt
         uses: jurplel/[email protected]
         with:
           # Version of Qt to install

diff --git a/.github/workflows/macos-11_0.yml b/.github/workflows/macos-11_0.yml
@@ -48,20 +48,23 @@ jobs:
         run: |
           qmake
           make
-      # tag 打包
-      # - 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
+      # 打包
+      - name: package
+        run: |
+          # 拷贝依赖
+          macdeployqt bin/release/${targetName}.app -qmldir=. -verbose=1 -dmg
+      # 上传artifacts          
+      - uses: actions/upload-artifact@v2
+        with:
+          name: ${targetName}_${{matrix.qt_ver}}.zip
+          path: bin/release/${targetName}.app
+      # 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