Skip to content

Commit

Permalink
Merge pull request #419 from d1vanov/feature-update-ci
Browse files Browse the repository at this point in the history
Update CI
  • Loading branch information
d1vanov authored Sep 5, 2024
2 parents 76f102a + 04f233d commit 45013fa
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/build_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -727,15 +727,15 @@ jobs:

- name: Upload AppImage
id: upload_appimage
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: quentier_linux
path: '${{ github.workspace }}/build/Quentier*.AppImage*'
if: ${{ matrix.qt_version == '5.12.8' && matrix.compiler_cpp == 'g++' }}

build_macos:
if: "!contains(github.event.head_commit.message, '[skip ci]')"
runs-on: macos-11
runs-on: macos-12
steps:
- uses: actions/checkout@v3

Expand Down Expand Up @@ -1052,7 +1052,7 @@ jobs:
- name: Upload app artifact
id: upload_artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: quentier_macos
path: '${{ github.workspace }}/build/installdir/Quentier_mac_x86_64.zip'
Expand Down Expand Up @@ -2060,31 +2060,31 @@ jobs:

- name: Upload x86 setup package
id: upload_setup_package_x86
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: quentier_windows_x86_setup
path: '${{ github.workspace }}\SetupQuentier 0.5.0 Qt 5.15.2 MSVC2019 Win32.exe'
if: ${{ matrix.target_arch == 'x86' }}

- name: Upload x86 portable package
id: upload_portable_package_x86
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: quentier_windows_x86_portable
path: '${{ github.workspace }}\Quentier-windows-portable-x86.zip'
if: ${{ matrix.target_arch == 'x86' }}

- name: Upload x64 setup package
id: upload_setup_package_x64
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: quentier_windows_x64_setup
path: '${{ github.workspace }}\SetupQuentier 0.5.0 Qt 5.15.2 MSVC2019 x64.exe'
if: ${{ matrix.target_arch == 'x64' }}

- name: Upload x64 portable package
id: upload_portable_package_x64
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: quentier_windows_x64_portable
path: '${{ github.workspace }}\Quentier-windows-portable-x64.zip'
Expand Down Expand Up @@ -2170,42 +2170,42 @@ jobs:
- name: Download linux artifacts
id: download_linux_artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: quentier_linux
path: '${{ github.workspace }}/artifacts'

- name: Download macOS artifact
id: download_macos_artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: quentier_macos
path: '${{ github.workspace }}/artifacts'

- name: Download Windows x86 setup package
id: download_windows_x86_setup_package
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: quentier_windows_x86_setup
path: '${{ github.workspace }}/artifacts'

- name: Download Windows x86 portable package
id: download_windows_x86_portable_package
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: quentier_windows_x86_portable
path: '${{ github.workspace }}/artifacts'

- name: Download Windows x64 setup package
id: download_windows_x64_setup_package
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: quentier_windows_x64_setup
path: '${{ github.workspace }}/artifacts'

- name: Download Windows x64 portable package
id: download_windows_x64_portable_package
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: quentier_windows_x64_portable
path: '${{ github.workspace }}/artifacts'
Expand Down

0 comments on commit 45013fa

Please sign in to comment.