diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2022-07-08 11:20:55 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2022-08-02 16:06:28 +0000 |
commit | cd9ee0526a6ed2dfb57dc5ecc1cf2613e0c499b7 (patch) | |
tree | ea7bd7e2a560b845ae348f03c7f931b088d5a5b4 | |
parent | 1201bd39dd4bd5901aacaee235bd7371e59f3337 (diff) | |
download | qbs-cd9ee0526a6ed2dfb57dc5ecc1cf2613e0c499b7.tar.gz |
Update static docker image to Qt 6.3.1
Change-Id: I6ebb9976cd003e9d1a6bbf0a16730088c4c4fb8c
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
-rw-r--r-- | .github/workflows/main.yml | 2 | ||||
-rw-r--r-- | docker-compose.yml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 64133d05e..1c513cade 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -329,7 +329,7 @@ jobs: script: './scripts/test-qt.sh', } - { - name: 'Run Linux tests (gcc, Qt 6.2 static)', + name: 'Run Linux tests (gcc, Qt 6.3 static)', image: 'focal-qt6-static', profile: 'qt-gcc_64', script: './scripts/test-qt.sh', diff --git a/docker-compose.yml b/docker-compose.yml index ed294dfd8..19ea817da 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,12 +43,12 @@ services: focal-qt6-static: << : *linux hostname: focal-qt6-static - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-qt6-static-6.2.0_1.20.1-1 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-qt6-static-6.3.1_1.20.1-0 build: dockerfile: docker/focal/test-qt6-static.Dockerfile context: . args: - QT_VERSION: 6.2.0 + QT_VERSION: 6.3.1 QTCREATOR_VERSION: 5.0.3 focal-android-513: |