From b245c3d762acf290c0d063323d3c57d6285404a9 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Thu, 1 Sep 2022 09:50:22 +0200 Subject: [PATCH] use the new CI images should ensure a proper AppImage build Signed-off-by: Matthieu Gallien --- .drone.yml | 16 ++++++++-------- .github/workflows/sonarcloud.yml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index 72c474c5d..5902cfbab 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,7 +3,7 @@ name: qt-5.15 steps: - name: cmake - image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-8 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-9 volumes: - name: build path: /drone/build @@ -11,7 +11,7 @@ steps: - cd /drone/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 -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-8 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-9 volumes: - name: build path: /drone/build @@ -19,7 +19,7 @@ steps: - cd /drone/build - ninja - name: test - image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-8 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-9 volumes: - name: build path: /drone/build @@ -47,7 +47,7 @@ name: qt-5.15-clang steps: - name: cmake - image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-8 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-9 volumes: - name: build path: /drone/build @@ -55,7 +55,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 -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-8 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-9 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-8 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-9 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-8 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-9 volumes: - name: build path: /drone/build @@ -98,7 +98,7 @@ name: AppImage steps: - name: build - image: ghcr.io/nextcloud/continuous-integration-client-appimage:client-appimage-4 + image: ghcr.io/nextcloud/continuous-integration-client-appimage:client-appimage-5 environment: CI_UPLOAD_GIT_TOKEN: from_secret: CI_UPLOAD_GIT_TOKEN diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index c2f838699..527e8fe8b 100644 --- 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-8 + container: ghcr.io/nextcloud/continuous-integration-client:client-5.15-9 env: SONAR_SERVER_URL: "https://sonarcloud.io" BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed