mirror of
https://github.com/kiwix/kiwix-desktop.git
synced 2025-09-22 11:37:56 -04:00
Merge pull request #1312 from kiwix/specify-qt5-ci-compilation
Explicitly set Qt version to compile against
This commit is contained in:
commit
df4e3fb787
7
.github/workflows/ci.yml
vendored
7
.github/workflows/ci.yml
vendored
@ -63,17 +63,20 @@ jobs:
|
|||||||
- target: jammy-qt5
|
- target: jammy-qt5
|
||||||
image_variant: jammy
|
image_variant: jammy
|
||||||
lib_postfix: '/x86_64-linux-gnu'
|
lib_postfix: '/x86_64-linux-gnu'
|
||||||
|
qt_version: 5
|
||||||
- target: noble-qt6.4
|
- target: noble-qt6.4
|
||||||
image_variant: noble
|
image_variant: noble
|
||||||
lib_postfix: '/x86_64-linux-gnu'
|
lib_postfix: '/x86_64-linux-gnu'
|
||||||
|
qt_version: 6
|
||||||
- target: oracular-qt6.6
|
- target: oracular-qt6.6
|
||||||
image_variant: oracular
|
image_variant: oracular
|
||||||
lib_postfix: '/x86_64-linux-gnu'
|
lib_postfix: '/x86_64-linux-gnu'
|
||||||
|
qt_version: 6
|
||||||
env:
|
env:
|
||||||
HOME: /home/runner
|
HOME: /home/runner
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
container:
|
container:
|
||||||
image: ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:2024-12-18
|
image: ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:2025-01-05
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
@ -89,5 +92,7 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
PKG_CONFIG_PATH: "/home/runner/BUILD_linux-x86_64/INSTALL/lib/pkgconfig:/home/runner/BUILD_linux-x86_64/INSTALL/lib${{matrix.lib_postfix}}/pkgconfig"
|
PKG_CONFIG_PATH: "/home/runner/BUILD_linux-x86_64/INSTALL/lib/pkgconfig:/home/runner/BUILD_linux-x86_64/INSTALL/lib${{matrix.lib_postfix}}/pkgconfig"
|
||||||
run: |
|
run: |
|
||||||
|
export QT_SELECT=qt${{matrix.qt_version}}
|
||||||
|
qmake --version
|
||||||
qmake PREFIX=$HOME/BUILD_linux-x86_64/INSTALL
|
qmake PREFIX=$HOME/BUILD_linux-x86_64/INSTALL
|
||||||
make
|
make
|
||||||
|
Loading…
x
Reference in New Issue
Block a user