Skip to content

updated workflows to jurplel/install-qt-action@v3 #4708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danmar merged 3 commits into from
Jan 18, 2023
Merged

updated workflows to jurplel/install-qt-action@v3 #4708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
caf09d3
updated workflows to `jurplel/install-qt-action@v3`
firewave Jan 12, 2023
c87bee2
release-windows.yml: removed installation of unavailable `qthelp` module
firewave Jan 12, 2023
7fa8efb
release-windows.yml: do not hard-code `tools_openssl_x64` version
firewave Jan 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions .github/workflows/CI-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
11 changes: 2 additions & 9 deletions .github/workflows/clang-tidy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
19 changes: 6 additions & 13 deletions .github/workflows/release-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ on:
- cron: '0 0 * * *'
workflow_dispatch:

permissions:
contents: read
permissions:
contents: read

defaults:
run:
Expand Down Expand Up @@ -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: |
Expand Down
11 changes: 2 additions & 9 deletions .github/workflows/selfcheck.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down