diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2024-02-15 01:23:44 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2024-02-19 14:05:42 +0000 |
| commit | 569f804a75c045785a626f2cc8806af9e5ae5978 (patch) | |
| tree | 569b5c5247669c008986e0aa6c781a026ea10161 | |
| parent | 589d30c820b155278f4e6d580a1f3fbb50ffc9cc (diff) | |
docker: update qt5 image to Jammy
As well as GitHub actions jobs.
Change-Id: Ic942f953c4ba7aebe9062280134e9ea0b7b9da0c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | .github/workflows/main.yml | 4 | ||||
| -rw-r--r-- | docker-compose.yml | 25 |
2 files changed, 13 insertions, 16 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d511c2968..61e47cb6f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -112,7 +112,7 @@ jobs: } - { name: 'Build on Linux (gcc, Qt 5.15)', - image: 'focal', + image: 'jammy-qt5', script: './scripts/build-qbs-with-qbs.sh', options: 'modules.cpp.compilerWrapper:ccache modules.qbs.debugInformation:true @@ -366,7 +366,7 @@ jobs: } - { name: 'Run Linux tests (gcc, Qt 5)', - image: 'focal-qt5', + image: 'jammy-qt5', suffix: 'linux', profile: 'qt-gcc_64', script: './scripts/test-qt.sh', diff --git a/docker-compose.yml b/docker-compose.yml index 28b4b904a..41946ba08 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,6 +29,17 @@ services: QT_VERSION: 6.5.3 QTCREATOR_VERSION: 11.0.3 + jammy-qt5: + << : *linux + hostname: jammy-qt5 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:jammy-5.15.2_2.1.2-0 + build: + dockerfile: docker/jammy/Dockerfile + context: . + args: + QT_VERSION: 5.15.2 + QTCREATOR_VERSION: 11.0.3 + jammy: << : *jammy-qt6 @@ -43,17 +54,6 @@ services: QT_VERSION: 6.5.0 QTCREATOR_VERSION: 11.0.3 - focal-qt5: &focal-qt5 - << : *linux - hostname: focal-qt5 - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-5.15.2_1.24.1-0 - build: - dockerfile: docker/focal/Dockerfile - context: . - args: - QT_VERSION: 5.15.2 - QTCREATOR_VERSION: 9.0.2 - focal-qt6: << : *linux hostname: focal-qt6 @@ -65,9 +65,6 @@ services: QT_VERSION: 6.5.0 QTCREATOR_VERSION: 9.0.2 - focal: - << : *focal-qt5 - focal-android-515: << : *linux hostname: focal-android |