use the new CI images with Qt6

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>

diff --git a/.drone.yml b/.drone.yml
index 1c5e4f57c78cec4fa5aaa65decb006a6db11801b..a1c9954b759fcd807368dd6187d45c03a6286681 100644 (file)
--- a/.drone.yml
+++ b/.drone.yml
@@ -4,7 +4,7 @@ name: qt-5.15
 
 steps:
 - name: cmake
-  image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-15
+  image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.4.2-1
   volumes:
     - name: build
       path: /drone/build
@@ -13,7 +13,7 @@ steps:
     - 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 -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:client-5.15-15
+  image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.4.2-1
   volumes:
     - name: build
       path: /drone/build
@@ -22,7 +22,7 @@ steps:
     - ninja
 
 - name: test
-  image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-15
+  image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.4.2-1
   volumes:
     - name: build
       path: /drone/build
@@ -79,7 +79,7 @@ name: qt-5.15-clang
 
 steps:
 - name: cmake
-  image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-15
+  image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.4.2-1
   volumes:
     - name: build
       path: /drone/build
@@ -87,7 +87,7 @@ steps:
     - 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 -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:client-5.15-15
+  image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.4.2-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:client-5.15-15
+  image: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.4.2-1
   volumes:
     - name: build
       path: /drone/build
@@ -152,7 +152,7 @@ name: AppImage
 
 steps:
 - name: build
-  image: ghcr.io/nextcloud/continuous-integration-client-appimage:client-appimage-10
+  image: ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-6.4.2-1
   environment:
     CI_UPLOAD_GIT_TOKEN:
       from_secret: CI_UPLOAD_GIT_TOKEN

diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
index 59ec83b32ce688a507a1f462d03cd81efcb36783..cd96793fdd613eb89ae2b565184d71d8e06e81ec 100644 (file)
--- 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:client-5.15-15
+    container: ghcr.io/nextcloud/continuous-integration-client-qt6:client-6.4.2-1
     env:
       SONAR_SERVER_URL: "https://sonarcloud.io"
       BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed