CI: update actions/upload-artifact to v4

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

Hide file tree

Showing 7 changed files with 28 additions and 22 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -138,9 +138,9 @@ jobs:
           7z a RabbitCommon_${{env.RabbitCommon_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.zip ./install/*
 
       - name: Update artifact
-        #if: ${{ matrix.BUILD_TYPE == 'Release' }}
-        uses: actions/upload-artifact@v3
+        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/RabbitCommon_${{env.RabbitCommon_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.zip
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -42,40 +42,46 @@ jobs:
           submodules: false
 
       - name: Download ubuntu
-        uses: actions/download-artifact@v4.1.7
+        uses: actions/download-artifact@v4
         with:
           name: ${{ needs.ubuntu.outputs.name }}
           path: ${{ env.artifact_path }}
+          merge-multiple: true
 
       - name: Download msvc
-        uses: actions/download-artifact@v4.1.7
+        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 mingw
-        uses: actions/download-artifact@v4.1.7
+        uses: actions/download-artifact@v4
         with:
           name: ${{ needs.mingw.outputs.name }}
           path: ${{ env.artifact_path }}
+          merge-multiple: true
 
       - name: Download macos
-        uses: actions/download-artifact@v4.1.7
+        uses: actions/download-artifact@v4
         with:
-          name: ${{ needs.macos.outputs.name }}
+          pattern: ${{ needs.macos.outputs.name }}_*
           path: ${{ env.artifact_path }}
+          merge-multiple: true
 
       - name: Download android
-        uses: actions/download-artifact@v4.1.7
+        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 doxygen
-        uses: actions/download-artifact@v4.1.7
+        uses: actions/download-artifact@v4
         with:
           name: ${{ needs.doxygen.outputs.name }}
           path: ${{ env.artifact_path }}
+          merge-multiple: true
 
       - name: Make Note.md file
         run: |
@@ -98,7 +104,7 @@ jobs:
           done
 
       - name: Upload To Github Release
-        #if: ${{ startsWith(github.ref, 'refs/tags/') }}
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
         run: |
           gh release create ${{ github.ref_name }} --title ${{ github.ref_name }} --notes-file ${{github.workspace}}/Note.md
           gh release upload ${{ github.ref_name }} ${{github.workspace}}/${{ env.artifact_path }}/* ${{github.workspace}}/Note.md
diff --git a/.github/workflows/doxygen.yml b/.github/workflows/doxygen.yml
@@ -88,7 +88,7 @@ jobs:
 
       - name: Update artifact
         if: ${{ env.BUILD_TYPE == 'Release' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name }}
           path: |

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -130,10 +130,10 @@ jobs:
           7z a RabbitCommon_${{env.RabbitCommon_VERSION}}_macos_${{matrix.BUILD_TYPE}}.zip ./install/*
       
       - name: Update artifact
-        #if: ${{ matrix.BUILD_TYPE == 'Release' }}
-        uses: actions/upload-artifact@v3
+        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/RabbitCommon-*.tar.gz
             ${{github.workspace}}/build/RabbitCommon_${{env.RabbitCommon_VERSION}}_macos_${{matrix.BUILD_TYPE}}.zip

diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml
@@ -183,8 +183,8 @@ jobs:
 
       - name: Update artifact
         if: ${{ matrix.BUILD_TYPE == 'Release' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.artifact_name }}
+          name: ${{ env.artifact_name }}_${{matrix.qt_version}}_${{matrix.qt_arch}}
           path: |
             ${{github.workspace}}\build\RabbitCommon_${{env.RabbitCommon_VERSION}}_msvc_${{matrix.CMAKE_GENERATOR_PLATFORM}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.zip
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -113,8 +113,8 @@ jobs:
           cp ../rabbitcommon*.deb .
 
       - name: Update artifact
-        #if: ${{ matrix.BUILD_TYPE == 'Release' }}
-        uses: actions/upload-artifact@v3
+        if: ${{ matrix.BUILD_TYPE == 'Release' }}
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name }}
           path: |

diff --git a/Src/RabbitCommon.pri b/Src/RabbitCommon.pri
@@ -55,7 +55,7 @@ DEFINES *= QT_MESSAGELOGCONTEXT
         $$PWD/Style/Style.h \
         $$PWD/Log/DockDebugLog.h \
         $$PWD/Log/DlgFilter.h
-    INCLUDEPATH += $$PWD/Style
+    INCLUDEPATH += $$PWD/Style $$PWD/DockFolderBrowser
     FORMS += $$PWD/Style/FrmStyle.ui \
        $$PWD/DockFolderBrowser/DockFolderBrowser.ui \
        $$PWD/Log/DockDebugLog.ui \