use new qt 6.6.3 ci images

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2024-04-10 08:58:03 +02:00 · 2024-04-10 08:58:03 +02:00 · 7d132029a2
parent 060181f83d
commit 7d132029a2
4 changed files with 16 additions and 16 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -4,16 +4,16 @@ name: qt-5.15

 steps:
 - name: cmake
-  image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.4.2-1
+  image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-1
  volumes:
    - name: build
      path: /drone/build
  commands:
    - cd /drone/build
-    - cmake -G Ninja -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_BUILD_TYPE=Debug -DQT_MAJOR_VERSION=6 -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DADD_E2E_TESTS=ON -DECM_ENABLE_SANITIZERS=address -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64 ../src
+    - cmake -G Ninja -DCMAKE_PREFIX_PATH=/opt/qt6.6.3 -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_BUILD_TYPE=Debug -DQT_MAJOR_VERSION=6 -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DADD_E2E_TESTS=ON -DECM_ENABLE_SANITIZERS=address -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64 ../src

 - name: compile
-  image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.4.2-1
+  image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-1
  volumes:
    - name: build
      path: /drone/build
@ -22,7 +22,7 @@ steps:
    - ninja

 - name: test
-  image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.4.2-1
+  image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-1
  volumes:
    - name: build
      path: /drone/build
@ -79,15 +79,15 @@ name: qt-5.15-clang

 steps:
 - name: cmake
-  image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.4.2-1
+  image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-1
  volumes:
    - name: build
      path: /drone/build
  commands:
    - cd /drone/build
-    - cmake -G Ninja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_C_COMPILER=clang-14 -DCMAKE_CXX_COMPILER=clang++-14 -DCMAKE_BUILD_TYPE=Debug -DQT_MAJOR_VERSION=6 -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DADD_E2E_TESTS=ON -DECM_ENABLE_SANITIZERS=address -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64 ../src
+    - cmake -G Ninja -DCMAKE_PREFIX_PATH=/opt/qt6.6.3 -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_C_COMPILER=clang-14 -DCMAKE_CXX_COMPILER=clang++-14 -DCMAKE_BUILD_TYPE=Debug -DQT_MAJOR_VERSION=6 -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DADD_E2E_TESTS=ON -DECM_ENABLE_SANITIZERS=address -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64 ../src
 - name: compile
-  image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.4.2-1
+  image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-1
  volumes:
    - name: build
      path: /drone/build
@ -95,7 +95,7 @@ steps:
    - cd /drone/build
    - ninja
 - name: test
-  image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.4.2-1
+  image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-1
  volumes:
    - name: build
      path: /drone/build
@ -152,7 +152,7 @@ name: AppImage

 steps:
 - name: build
-  image: ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-6.4.2-1
+  image: ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-6.6.3-1
  environment:
    CI_UPLOAD_GIT_TOKEN:
      from_secret: CI_UPLOAD_GIT_TOKEN
@ -206,6 +206,6 @@ trigger:
    - push
 ---
 kind: signature
-hmac: 49bf64b47cde39ed7396cf63f9d686b7c76a4e51dea4f54c7c81b3b3bc1314b3
+hmac: a1841244986f401565dda5413e5634275376c46ea6a6480ba049d14534c16a36

 ...
--- a/.github/workflows/linux-clang-compile-tests.yml
+++ b/.github/workflows/linux-clang-compile-tests.yml
@ -6,7 +6,7 @@ jobs:
  build:
    name: Linux Clang compilation and tests
    runs-on: ubuntu-latest
-    container: ghcr.io/nextcloud/continuous-integration-client:client-5.15-15
+    container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-1
    steps:
      - uses: actions/checkout@v4
        with:
@ -15,7 +15,7 @@ jobs:
        run: |
          mkdir build
          cd build
-          cmake .. -G Ninja -DCMAKE_C_COMPILER=clang-14 -DCMAKE_CXX_COMPILER=clang++-14 -DCMAKE_BUILD_TYPE=Debug -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64
+          cmake .. -G Ninja -DCMAKE_PREFIX_PATH=/opt/qt6.6.3 -DCMAKE_C_COMPILER=clang-14 -DCMAKE_CXX_COMPILER=clang++-14 -DCMAKE_BUILD_TYPE=Debug -DQT_MAJOR_VERSION=6 -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64
          ninja
      - name: Run tests
        run: |
--- a/.github/workflows/linux-gcc-compile-tests.yml
+++ b/.github/workflows/linux-gcc-compile-tests.yml
@ -6,7 +6,7 @@ jobs:
  build:
    name: Linux GCC compilation and tests
    runs-on: ubuntu-latest
-    container: ghcr.io/nextcloud/continuous-integration-client:client-5.15-15
+    container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-1
    steps:
      - uses: actions/checkout@v4
        with:
@ -15,7 +15,7 @@ jobs:
        run: |
          mkdir build
          cd build
-          cmake .. -G Ninja -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_BUILD_TYPE=Debug -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64
+          cmake .. -G Ninja -DCMAKE_PREFIX_PATH=/opt/qt6.6.3 -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_BUILD_TYPE=Debug -DQT_MAJOR_VERSION=6 -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64
          ninja
      - name: Run tests
        run: |
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@ -6,7 +6,7 @@ jobs:
  build:
    name: SonarCloud analysis
    runs-on: ubuntu-latest
-    container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.4.2-1
+    container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.6.3-1
    env:
      SONAR_SERVER_URL: "https://sonarcloud.io"
      BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
@ -25,7 +25,7 @@ jobs:
        run: |
          mkdir build
          cd build
-          cmake .. -G Ninja -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_BUILD_TYPE=Debug -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DQT_MAJOR_VERSION=6 -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64 -DBUILD_COVERAGE=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
+          cmake .. -G Ninja -DCMAKE_PREFIX_PATH=/opt/qt6.6.3 -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_BUILD_TYPE=Debug -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DQT_MAJOR_VERSION=6 -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64 -DBUILD_COVERAGE=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
          build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} ninja
      - name: Run tests
        run: |