updated workflows to `jurplel/install-qt-action@v3` (#4708)
* updated workflows to `jurplel/install-qt-action@v3` * release-windows.yml: removed installation of unavailable `qthelp` module * release-windows.yml: do not hard-code `tools_openssl_x64` version
This commit is contained in:
parent
c2de9843ca
commit
689dfd29c1
|
@ -32,20 +32,12 @@ jobs:
|
|||
with:
|
||||
arch: x64 # no 32-bit Qt available
|
||||
|
||||
- name: Cache Qt ${{ matrix.qt_ver }}
|
||||
id: cache-qt
|
||||
uses: actions/cache@v1 # not v2!
|
||||
with:
|
||||
path: ../Qt
|
||||
key: Windows-QtCache-${{ matrix.qt_ver }}-qtcharts
|
||||
|
||||
- name: Install Qt ${{ matrix.qt_ver }}
|
||||
uses: jurplel/install-qt-action@v2
|
||||
uses: jurplel/install-qt-action@v3
|
||||
with:
|
||||
aqtversion: '==2.0.6'
|
||||
version: ${{ matrix.qt_ver }}
|
||||
modules: 'qtcharts'
|
||||
cached: ${{ steps.cache-qt.outputs.cache-hit }}
|
||||
cache: true
|
||||
|
||||
- name: Build GUI release (qmake)
|
||||
if: startsWith(matrix.qt_ver, '5')
|
||||
|
|
|
@ -32,19 +32,12 @@ jobs:
|
|||
sudo ./llvm.sh 15
|
||||
sudo apt-get install -y clang-tidy-15
|
||||
|
||||
- name: Cache Qt ${{ env.QT_VERSION }}
|
||||
id: cache-qt
|
||||
uses: actions/cache@v1 # not v2!
|
||||
with:
|
||||
path: ../Qt
|
||||
key: Linux-QtCache-${{ env.QT_VERSION }}-qtcharts
|
||||
|
||||
- name: Install Qt ${{ env.QT_VERSION }}
|
||||
uses: jurplel/install-qt-action@v2
|
||||
uses: jurplel/install-qt-action@v3
|
||||
with:
|
||||
version: ${{ env.QT_VERSION }}
|
||||
modules: 'qtcharts'
|
||||
cached: ${{ steps.cache-qt.outputs.cache-hit }}
|
||||
cache: true
|
||||
|
||||
- name: Verify clang-tidy configuration
|
||||
run: |
|
||||
|
|
|
@ -12,8 +12,8 @@ on:
|
|||
- cron: '0 0 * * *'
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
defaults:
|
||||
run:
|
||||
|
@ -60,22 +60,15 @@ jobs:
|
|||
copy pcre.h ..\externals || exit /b !errorlevel!
|
||||
copy Release\pcre.lib ..\externals\pcre64.lib || exit /b !errorlevel!
|
||||
|
||||
- name: Cache Qt ${{ env.QT_VERSION }}
|
||||
id: cache-qt
|
||||
uses: actions/cache@v1 # not v2!
|
||||
with:
|
||||
path: ../Qt
|
||||
key: Windows-QtCache-${{ env.QT_VERSION }}-qtcharts-qthelp-openssl
|
||||
|
||||
# available modules: https://github.com/miurahr/aqtinstall/blob/master/docs/getting_started.rst#installing-modules
|
||||
# available tools: https://github.com/miurahr/aqtinstall/blob/master/docs/getting_started.rst#installing-tools
|
||||
- name: Install Qt ${{ env.QT_VERSION }}
|
||||
uses: jurplel/install-qt-action@v2
|
||||
uses: jurplel/install-qt-action@v3
|
||||
with:
|
||||
version: ${{ env.QT_VERSION }}
|
||||
modules: 'qtcharts qthelp'
|
||||
tools: 'tools_openssl_x64,1.1.1-10,qt.tools.openssl.win_x64'
|
||||
cached: ${{ steps.cache-qt.outputs.cache-hit }}
|
||||
modules: 'qtcharts'
|
||||
tools: 'tools_openssl_x64,qt.tools.openssl.win_x64'
|
||||
cache: true
|
||||
|
||||
- name: Create .qm
|
||||
run: |
|
||||
|
|
|
@ -33,19 +33,12 @@ jobs:
|
|||
sudo apt-get update
|
||||
sudo apt-get install clang-14 valgrind
|
||||
|
||||
- name: Cache Qt ${{ env.QT_VERSION }}
|
||||
id: cache-qt
|
||||
uses: actions/cache@v1 # not v2!
|
||||
with:
|
||||
path: ../Qt
|
||||
key: Linux-QtCache-${{ env.QT_VERSION }}-qtcharts
|
||||
|
||||
- name: Install Qt ${{ env.QT_VERSION }}
|
||||
uses: jurplel/install-qt-action@v2
|
||||
uses: jurplel/install-qt-action@v3
|
||||
with:
|
||||
version: ${{ env.QT_VERSION }}
|
||||
modules: 'qtcharts'
|
||||
cached: ${{ steps.cache-qt.outputs.cache-hit }}
|
||||
cache: true
|
||||
|
||||
# TODO: cache this - perform same build as for the other self check
|
||||
- name: Self check (build)
|
||||
|
|
Loading…
Reference in New Issue