diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 46d5aad..21d94ac 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -14,7 +14,7 @@ jobs: matrix: BUILD_TYPE: [Release] qt_arch: [android_arm64_v8a, android_x86_64] - qt_version: [6.6.2] + qt_version: [6.6.3] include: - BUILD_TYPE: Release qt_arch: android_arm64_v8a @@ -171,9 +171,9 @@ 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/Calendar_${{env.Calendar_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 index 15509ef..51257b7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,28 +39,32 @@ jobs: submodules: false - name: Download ubuntu - uses: actions/download-artifact@v3 + 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@v3 + 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 macos - uses: actions/download-artifact@v3 + 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@v3 + uses: actions/download-artifact@v4 with: - name: ${{ needs.android.outputs.name }} + pattern: ${{ needs.android.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 index 9859a13..8ab905f 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -18,12 +18,12 @@ jobs: matrix: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) 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] qt_arch: [clang_64] config_arch: [x86_64] VCPKG_TARGET_TRIPLET: [x64-osx] include: - - qt_version: 6.6.2 + - qt_version: 6.6.3 qt_modules: qtscxml qtmultimedia qtwebchannel qtwebsockets qtwebview qtpositioning - qt_version: 5.15.2 @@ -122,10 +122,10 @@ jobs: "https://github.com/KangLin/Calendar/releases/download/v${{env.Calendar_VERSION}}/Calendar_${{env.Calendar_VERSION}}_macos_qt${{matrix.qt_version}}.zip,https://sourceforge.net/projects/rabbitcalendar/files/v${{env.Calendar_VERSION}}/Calendar_${{env.Calendar_VERSION}}_macos_qt${{matrix.qt_version}}.zip" - name: Update artifact - 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/Calendar_${{env.Calendar_VERSION}}_macos_qt${{matrix.qt_version}}.zip ${{github.workspace}}/build/update_macos_${{matrix.qt_version}}.json diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml index b3eeeb6..8d5391f 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 VCPKG_TARGET_TRIPLET: x64-windows VCPKG_PLATFORM_TOOLSET: v143 qt_arch: win64_msvc2019_64 @@ -149,16 +149,16 @@ jobs: -u "https://github.com/KangLin/Calendar/releases/download/${{env.Calendar_VERSION}}/Calendar_${{env.Calendar_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}.exe;https://sourceforge.net/projects/rabbitcalendar/files/${{env.Calendar_VERSION}}/Calendar_${{env.Calendar_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}.exe" - name: Update xml file - if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.6.2' }} + if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.6.3' }} working-directory: ${{github.workspace}}\build run: | mv update_${{matrix.qt_arch}}_${{matrix.qt_version}}.json.xml update_windows.xml - name: Update artifact - if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.6.2' }} - uses: actions/upload-artifact@v3 + 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\Calendar_${{env.Calendar_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}.exe ${{github.workspace}}\build\update_${{matrix.qt_arch}}_${{matrix.qt_version}}.json diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 4fdf882..a9bdd38 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -110,7 +110,7 @@ jobs: - name: Update artifact if: ${{ matrix.BUILD_TYPE == 'Release' }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.artifact_name }} path: | diff --git a/3th_libs/LunarCalendar b/3th_libs/LunarCalendar index 38f84ed..60ae37d 160000 --- a/3th_libs/LunarCalendar +++ b/3th_libs/LunarCalendar @@ -1 +1 @@ -Subproject commit 38f84ed8faaf6e1eb727a23deaa5af082751ae8a +Subproject commit 60ae37dc7fd4a06b52b018745b24fd93abb5ff52