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 e9e3f68 commit b58d9f2
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 19 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,24 +43,28 @@ jobs:
with:
name: ${{ needs.ubuntu.outputs.name }}
path: ${{ env.artifact_path }}
merge-multiple: true

- name: Download msvc
uses: actions/download-artifact@v3
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
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
with:
name: ${{ needs.android.outputs.name }}
pattern: ${{ needs.android.outputs.name }}*
path: ${{ env.artifact_path }}
merge-multiple: true

- name: Process configure file
run: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 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
VCPKG_TARGET_TRIPLET: x64-windows
VCPKG_PLATFORM_TOOLSET: v143
qt_arch: win64_msvc2019_64
Expand Down Expand Up @@ -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 == '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}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}.exe
${{github.workspace}}\build\update_${{matrix.qt_arch}}_${{matrix.qt_version}}.json
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down

0 comments on commit b58d9f2

Please sign in to comment.