From dbeb5d5f8bc3d09e6d3b3312bbac313625173f7f Mon Sep 17 00:00:00 2001 From: Kang Lin Date: Sat, 14 Sep 2024 10:40:58 +0800 Subject: [PATCH] CI: update actions/download-artifact to 4 See: https://github.com/actions/download-artifact/blob/v4.1.8/docs/MIGRATION.md --- .github/workflows/android.yml | 6 +++--- .github/workflows/build.yml | 24 +++++++++++++++--------- .github/workflows/doxygen.yml | 2 +- .github/workflows/macos.yml | 6 +++--- .github/workflows/mingw.yml | 4 ++-- .github/workflows/msvc.yml | 10 +++++----- .github/workflows/ubuntu.yml | 2 +- 7 files changed, 30 insertions(+), 24 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 312f27fd..2d0e6466 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -164,10 +164,10 @@ jobs: cp $APK_FILE LunarCalendar_${{env.LunarCalendar_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.apk - 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/LunarCalendar_${{env.LunarCalendar_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.zip ${{github.workspace}}/build/LunarCalendar_${{env.LunarCalendar_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.apk diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b57d290d..f8755515 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,40 +43,46 @@ jobs: submodules: true - 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 Notes.md file run: | diff --git a/.github/workflows/doxygen.yml b/.github/workflows/doxygen.yml index 89b91159..56e34dfe 100644 --- a/.github/workflows/doxygen.yml +++ b/.github/workflows/doxygen.yml @@ -93,7 +93,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 index 18b4fb76..295083ef 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -106,10 +106,10 @@ jobs: 7z a LunarCalendar_${{env.LunarCalendar_VERSION}}_macos_qt${{matrix.qt_version}}_${{ matrix.BUILD_TYPE }}.zip ./install/* - name: Update artifact - #if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '5.12.12' }} - uses: actions/upload-artifact@v3 + if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.6.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/LunarCalendar_${{env.LunarCalendar_VERSION}}_macos_qt${{matrix.qt_version}}_${{ matrix.BUILD_TYPE }}.zip diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 0591f99d..c8f41d89 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -91,8 +91,8 @@ jobs: 7z a LunarCalendar_${{env.LunarCalendar_VERSION}}_mingw_${{matrix.BUILD_TYPE}}.zip .\install\* - name: Update artifact - #if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '5.12.12' }} - uses: actions/upload-artifact@v3 + if: ${{ matrix.BUILD_TYPE == 'Release' }} + uses: actions/upload-artifact@v4 with: name: ${{ env.artifact_name }} path: | diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml index b5a598f5..c4422925 100644 --- a/.github/workflows/msvc.yml +++ b/.github/workflows/msvc.yml @@ -13,9 +13,9 @@ jobs: strategy: matrix: BUILD_TYPE: [Release, Debug] - qt_version: [6.6.2, 5.15.2, 5.12.12] + qt_version: [6.6.3, 5.15.2, 5.12.12] include: - - qt_version: 6.6.2 + - qt_version: 6.6.3 triplet: x64-windows VCPKG_PLATFORM_TOOLSET: v143 qt_arch: win64_msvc2019_64 @@ -192,9 +192,9 @@ jobs: cmake --build . --config ${{ matrix.BUILD_TYPE }} --target package - name: Update artifact for application - if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.6.2' }} - uses: actions/upload-artifact@v3 + 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_package\LunarCalendar_${{env.LunarCalendar_VERSION}}_*_setup.exe diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 4c9696eb..7df06fa9 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -105,7 +105,7 @@ jobs: - name: Update artifact for application if: ${{ matrix.BUILD_TYPE == 'Release' }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.artifact_name }} path: |