From 26a2731579fc2b7c9cf84cb2e4d5b0a18e180519 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Tue, 22 Aug 2023 13:47:41 +0200 Subject: [PATCH] update main CI image to get newer Qt, Java and other dependencies Signed-off-by: Matthieu Gallien --- .drone.yml | 12 ++++++------ .github/workflows/sonarcloud.yml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index e40de9270..1b7092fdd 100644 --- 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-11 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-13 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-11 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-13 volumes: - name: build path: /drone/build @@ -22,7 +22,7 @@ steps: - ninja - name: test - image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-11 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-13 volumes: - name: build path: /drone/build @@ -74,7 +74,7 @@ name: qt-5.15-clang steps: - name: cmake - image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-11 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-13 volumes: - name: build path: /drone/build @@ -82,7 +82,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-11 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-13 volumes: - name: build path: /drone/build @@ -90,7 +90,7 @@ steps: - cd /drone/build - ninja - name: test - image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-11 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-13 volumes: - name: build path: /drone/build diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index b179cddf4..6373c1839 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -9,7 +9,7 @@ jobs: build: name: Build runs-on: ubuntu-22.04 - container: ghcr.io/nextcloud/continuous-integration-client:client-5.15-11 + container: ghcr.io/nextcloud/continuous-integration-client:client-5.15-13 env: SONAR_SERVER_URL: "https://sonarcloud.io" BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed -- 2.30.2