diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2023-06-25 09:33:54 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2023-06-26 11:03:29 +0000 |
| commit | b8db83b19076cff794f0063ff970ada0c2193d17 (patch) | |
| tree | 668f536583ed486690050b2ca27347044b3a7f3c | |
| parent | 1af935aec680a3e2df3919807f631a6ee2c21e35 (diff) | |
docker: update qt static image
...and install llvm into it to be able to build qdoc
Change-Id: I9b468403fe690eed482c379a0c78ed5c1cd6e0a7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | .github/workflows/main.yml | 2 | ||||
| -rw-r--r-- | docker-compose.yml | 6 | ||||
| -rw-r--r-- | docker/focal/test-qt6-static.Dockerfile | 13 |
3 files changed, 12 insertions, 9 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c41be8307..53cbbe762 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -338,7 +338,7 @@ jobs: script: './scripts/test-qt.sh', } - { - name: 'Run Linux tests (gcc, Qt 6.3 static)', + name: 'Run Linux tests (gcc, Qt 6.5 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 8d7a78dac..842c2f8de 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -46,13 +46,13 @@ services: focal-qt6-static: << : *linux hostname: focal-qt6-static - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-qt6-static-6.3.1_1.20.1-0 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-qt6-static-6.5.0_1.24.1-0 build: dockerfile: docker/focal/test-qt6-static.Dockerfile context: . args: - QT_VERSION: 6.3.1 - QTCREATOR_VERSION: 5.0.3 + QT_VERSION: 6.5.0 + QTCREATOR_VERSION: 9.0.2 focal-android-515: << : *linux diff --git a/docker/focal/test-qt6-static.Dockerfile b/docker/focal/test-qt6-static.Dockerfile index 61316e372..b7c0bbc62 100644 --- a/docker/focal/test-qt6-static.Dockerfile +++ b/docker/focal/test-qt6-static.Dockerfile @@ -43,6 +43,7 @@ RUN apt-get update -qq && \ build-essential \ git \ perl \ + clang-12 \ cmake \ python \ zlib1g-dev \ @@ -56,6 +57,7 @@ RUN apt-get update -qq && \ libvulkan-dev \ libicu-dev \ libb2-dev \ + libclang-12-dev \ libsystemd-dev \ libfontconfig1-dev \ libfreetype6-dev \ @@ -101,6 +103,7 @@ RUN apt-get update -qq && \ libxcb-damage0-dev \ libxcb-dpms0-dev \ libgstreamer1.0-dev \ + llvm-12-dev \ apt-transport-https ENV QT_HOME="/home/${USER_NAME}/qt" @@ -153,8 +156,8 @@ RUN apt-get update -qq && \ ca-certificates \ capnproto \ ccache \ - clang-8 \ - clang-tidy-8 \ + clang-12 \ + clang-tidy-12 \ cmake \ curl \ flex \ @@ -186,9 +189,9 @@ RUN apt-get update -qq && \ zip \ libb2-1 \ libpcre++ && \ - update-alternatives --install /usr/bin/clang clang /usr/bin/clang-8 100 && \ - 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/clang clang /usr/bin/clang-12 100 && \ + update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-12 100 && \ + update-alternatives --install /usr/bin/clang-check clang-check /usr/bin/clang-check-12 100 && \ update-alternatives --install /usr/bin/python python /usr/bin/python3 100 && \ pip install beautifulsoup4 lxml protobuf pyyaml |