Skip to content

Commit

Permalink
CI: update actions/download-artifact to 4
Browse files Browse the repository at this point in the history
  • Loading branch information
KangLin committed Sep 14, 2024
1 parent 38f84ed commit 0417e8d
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 32 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
26 changes: 16 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
#if: ${{ startsWith(github.ref, 'refs/tags/') }}

deploy:
if: ${{ startsWith(github.ref, 'refs/tags/') }}
#if: ${{ startsWith(github.ref, 'refs/tags/') }}
runs-on: ubuntu-latest
needs: [ubuntu, msvc, mingw, macos, android, doxygen]
steps:
Expand All @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doxygen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mingw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/msvc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -127,9 +127,9 @@ jobs:
7z a LunarCalendar_${{env.LunarCalendar_VERSION}}_${{matrix.triplet}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.zip .\install\*
- name: Update artifact for develop library
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}}_${{matrix.BUILD_TYPE}}_library
path: |
${{github.workspace}}\build\LunarCalendar_${{env.LunarCalendar_VERSION}}_${{matrix.triplet}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.zip
Expand Down Expand Up @@ -163,9 +163,9 @@ jobs:
- name: Update artifact for application
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '5.12.12' }}
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}}_${{matrix.BUILD_TYPE}}_app
path: |
${{github.workspace}}\build_app\LunarCalendar_Setup_${{env.LunarCalendar_VERSION}}.exe
Expand All @@ -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}}_${{matrix.BUILD_TYPE}}
path: |
${{github.workspace}}\build_package\LunarCalendar_${{env.LunarCalendar_VERSION}}_*_setup.exe
8 changes: 4 additions & 4 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ jobs:
7z a LunarCalendar_v${{env.LunarCalendar_VERSION}}_ubuntu_${{matrix.BUILD_TYPE}}.zip ./install/*
- name: Update artifact for develop library
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.artifact_name }}
name: ${{ env.artifact_name }}_${{matrix.BUILD_TYPE}}_library
path: |
${{github.workspace}}/build/LunarCalendar_v${{env.LunarCalendar_VERSION}}_ubuntu_${{matrix.BUILD_TYPE}}.zip
Expand All @@ -105,9 +105,9 @@ 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 }}
name: ${{ env.artifact_name }}_${{matrix.BUILD_TYPE}}
path: |
${{github.workspace}}/lunarcalendar_*.deb
${{github.workspace}}/lunarcalendar-dev*.deb

0 comments on commit 0417e8d

Please sign in to comment.