switch to using the main client CI image based on ubuntu 22.04

will get an upgraded openssl
will get an upgraded Qt

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

diff --git a/.drone.yml b/.drone.yml
index 1ffef5c66ef2ba4e29a03db6879afed111409b3a..00000e3e2562354e80cf41ef3815f9985d602b4e 100644 (file)
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,23 +3,23 @@ name: qt-5.15
 
 steps:
 - name: cmake
-  image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-4
+  image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-7
   volumes:
     - name: build
       path: /drone/build
   commands:
     - cd /drone/build
-    - cmake -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10 -DCMAKE_BUILD_TYPE=Debug -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DECM_ENABLE_SANITIZERS=address -DCMAKE_CXX_FLAGS=-Werror ../src
+    - 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 -DECM_ENABLE_SANITIZERS=address -DCMAKE_CXX_FLAGS=-Werror ../src
 - name: compile
-  image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-4
+  image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-7
   volumes:
     - name: build
       path: /drone/build
   commands:
     - cd /drone/build
-    - make -j$(nproc)
+    - ninja
 - name: test
-  image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-4
+  image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-7
   volumes:
     - name: build
       path: /drone/build
@@ -47,15 +47,15 @@ name: qt-5.15-clang
 
 steps:
 - name: cmake
-  image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-4
+  image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-7
   volumes:
     - name: build
       path: /drone/build
   commands:
     - cd /drone/build
-    - cmake -GNinja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_C_COMPILER=clang-10 -DCMAKE_CXX_COMPILER=clang++-10 -DCMAKE_BUILD_TYPE=Debug -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DECM_ENABLE_SANITIZERS=address -DCMAKE_CXX_FLAGS=-Werror ../src
+    - 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 -DECM_ENABLE_SANITIZERS=address -DCMAKE_CXX_FLAGS=-Werror ../src
 - name: compile
-  image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-4
+  image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-7
   volumes:
     - name: build
       path: /drone/build
@@ -63,7 +63,7 @@ steps:
     - cd /drone/build
     - ninja
 - name: test
-  image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-4
+  image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-7
   volumes:
     - name: build
       path: /drone/build
@@ -73,7 +73,7 @@ steps:
     - chown -R test:test .
     - su -c 'ASAN_OPTIONS=detect_leaks=0 xvfb-run ctest --output-on-failure' test
 - name: clang-tidy
-  image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-4
+  image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-7
   volumes:
     - name: build
       path: /drone/build

diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
index 4843f25b6a0b54a174e8f7171a0a605b0781856d..c607407ab96716baee875de44b46dd7612c216ed 100644 (file)
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -9,7 +9,7 @@ jobs:
   build:
     name: Build
     runs-on: ubuntu-latest
-    container: ghcr.io/nextcloud/continuous-integration-client:client-5.15-4
+    container: ghcr.io/nextcloud/continuous-integration-client:client-5.15-7
     env:
       SONAR_SERVER_URL: "https://sonarcloud.io"
       BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
@@ -28,8 +28,8 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10 -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DBUILD_COVERAGE=ON
-          build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} make -j 2
+          cmake .. -G Ninja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11 -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DBUILD_COVERAGE=ON
+          build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} ninja
       - name: Run tests
         run: |
           cd build