CI: actions/upload-artifact@v4

See: https://github.com/actions/download-artifact/blob/v4.1.8/docs/MIGRATION.md
KangLin · Sep 14, 2024 · 775056a · 775056a
1 parent b4e9272
commit 775056a
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -155,7 +155,7 @@ jobs:
         if: ${{ matrix.BUILD_TYPE == 'Release' }}
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.artifact_name }}
+          name: ${{ env.artifact_name }}_${{matrix.qt_version}}_${{matrix.qt_arch}}
           path: |
             ${{github.workspace}}/build/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.apk
             ${{github.workspace}}/build/update_${{matrix.qt_arch}}_${{matrix.qt_version}}.json
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,7 +27,7 @@ jobs:
     secrets: inherit
 
   deploy:
-#    if: ${{ startsWith(github.ref, 'refs/tags/') }}
+    if: ${{ startsWith(github.ref, 'refs/tags/') }}
     runs-on: ubuntu-latest
     needs: [ubuntu, msvc, android, macos]
     steps:
@@ -41,24 +41,28 @@ jobs:
         with:
           name: ${{ needs.ubuntu.outputs.name }}
           path: ${{ env.artifact_path }}
+          merge-multiple: true
 
       - name: Download msvc
         uses: actions/download-artifact@v4
         with:
-          name: ${{ needs.msvc.outputs.name }}
+          pattern: ${{ needs.msvc.outputs.name }}_*
           path: ${{ env.artifact_path }}
+          merge-multiple: true
 
       - name: Download android
         uses: actions/download-artifact@v4
         with:
-          name: ${{ needs.android.outputs.name }}
+          pattern: ${{ needs.android.outputs.name }}_*
           path: ${{ env.artifact_path }}
+          merge-multiple: true
 
       - name: Download macos
         uses: actions/download-artifact@v4
         with:
-          name: ${{ needs.macos.outputs.name }}
+          pattern: ${{ needs.macos.outputs.name }}_*
           path: ${{ env.artifact_path }}
+          merge-multiple: true
 
       - name: Process configure file
         run: |

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -129,7 +129,7 @@ jobs:
         if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.6.3' }}
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.artifact_name }}
+          name: ${{ env.artifact_name }}_${{matrix.qt_version}}_${{matrix.qt_arch}}
           path: |
             ${{github.workspace}}/build/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_qt${{matrix.qt_version}}_macos.zip
             ${{github.workspace}}/build/update_macos_${{matrix.qt_version}}.json
diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
@@ -103,7 +103,7 @@ jobs:
           makensis ${{github.workspace}}\build\Install.nsi
 
       - name: update artifact
-        if: false
+        if: false # ${{ matrix.BUILD_TYPE == 'Release' }}
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name }}

diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml
@@ -151,10 +151,10 @@ jobs:
                -u "https://github.com/KangLin/SerialPortAssistant/releases/download/${{env.SerialPortAssistant_VERSION}}/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_${{ matrix.qt_arch}}_qt${{matrix.qt_version}}_Setup.exe ;https://sourceforge.net/projects/rabbitSerialPortAssistant/files/${{env.SerialPortAssistant_VERSION}}/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_${{ matrix.qt_arch}}_qt${{matrix.qt_version}}_Setup.exe"
 
       - name: Update artifact
-        if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.6.3' }}
+        if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version != '5.15.2' }}
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.artifact_name }}
+          name: ${{ env.artifact_name }}_${{matrix.qt_version}}_${{matrix.qt_arch}}
           path: |
             ${{github.workspace}}\build\SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_${{ matrix.qt_arch}}_qt${{matrix.qt_version}}_Setup.exe
             ${{github.workspace}}\build\update_${{matrix.qt_arch}}_${{matrix.qt_version}}.json

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -132,6 +132,7 @@ jobs:
       #    cp SerialPort_Assistant-${VERSION}-x86_64.AppImage ${{github.workspace}}/.
 
       - name: update
+        if: ${{ matrix.BUILD_TYPE == 'Release' }}
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name }}