diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2022-07-30 09:51:44 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2022-08-10 13:47:08 +0000 |
| commit | 26592a2bc681d14cb17e6659e1dc4e5d5fb5b922 (patch) | |
| tree | ed53f0384e5cf104a8eeae456419c7ba433dfc1c | |
| parent | 3927fe3514625618215a1196cb4504e5fe1c2974 (diff) | |
| download | qbs-26592a2bc681d14cb17e6659e1dc4e5d5fb5b922.tar.gz | |
Update focal-qt6 image to Qt 6.2.4
Change-Id: I098072d593d927d52b56e06d48e3fbe018c072a4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | .github/workflows/main.yml | 4 | ||||
| -rw-r--r-- | docker-compose.yml | 4 | ||||
| -rw-r--r-- | docker/focal/Dockerfile | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f4f213cc1..b76f8d0aa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -84,7 +84,7 @@ jobs: cacheid: 'qmake', } - { - name: 'Build on Linux (gcc, Qt 6)', + name: 'Build on Linux (gcc, Qt 6.2)', image: 'focal-qt6', script: './scripts/build-qbs-with-qbs.sh', options: 'modules.cpp.compilerWrapper:ccache @@ -323,7 +323,7 @@ jobs: script: './scripts/test-qbs.sh', } - { - name: 'Run Linux tests (gcc, Qt 6.0)', + name: 'Run Linux tests (gcc, Qt 6.2)', image: 'focal-qt6', profile: 'qt-gcc_64', script: './scripts/test-qt.sh', diff --git a/docker-compose.yml b/docker-compose.yml index efe88bb6b..7ab682ea4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,12 +32,12 @@ services: focal-qt6: << : *linux hostname: focal-qt6 - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-qt6-6.2.0_1.20.1-1 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-qt6-6.2.4_1.20.1-0 build: dockerfile: docker/focal/Dockerfile context: . args: - QT_VERSION: 6.2.0 + QT_VERSION: 6.2.4 QTCREATOR_VERSION: 5.0.3 focal: diff --git a/docker/focal/Dockerfile b/docker/focal/Dockerfile index df687f3a0..405fe0a16 100644 --- a/docker/focal/Dockerfile +++ b/docker/focal/Dockerfile @@ -75,7 +75,7 @@ RUN apt-get update -qq && \ update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-8 100 && \ update-alternatives --install /usr/bin/clang-check clang-check /usr/bin/clang-check-8 100 && \ update-alternatives --install /usr/bin/python python /usr/bin/python3 100 && \ - pip install beautifulsoup4 lxml protobuf pyyaml + pip install beautifulsoup4 lxml protobuf==3.19.1 pyyaml ENV LLVM_INSTALL_DIR=/usr/lib/llvm-8 |