From 5def95919eddd72b52245d0b761a64ebf049b6ad Mon Sep 17 00:00:00 2001 From: Camila Date: Mon, 3 Oct 2022 16:59:14 +0200 Subject: [PATCH] Remove clang-tidy from .drone.yml. It is being replaced by GH actions. Signed-off-by: Camila --- .clang-tidy | 45 -------------------------------- .drone.yml | 19 +++++--------- .github/workflows/sonarcloud.yml | 2 +- 3 files changed, 7 insertions(+), 59 deletions(-) delete mode 100644 .clang-tidy diff --git a/.clang-tidy b/.clang-tidy deleted file mode 100644 index c064c54d8fbcf..0000000000000 --- a/.clang-tidy +++ /dev/null @@ -1,45 +0,0 @@ -Checks: '-*, - bugprone-*, - -bugprone-forward-declaration-namespace, - cppcoreguidelines-init-variables, - misc-*, - -misc-non-private-member-variables-in-classes, - modernize-avoid-bind, - modernize-concat-nested-namespaces, - modernize-deprecated-headers, - modernize-deprecated-ios-base-aliases, - modernize-loop-convert, - modernize-make-*, - modernize-raw-string-literal, - modernize-redundant-void-arg, - modernize-replace-*, - modernize-return-braced-init-list, - modernize-shrink-to-fit, - modernize-unary-static-assert, - modernize-use-auto, - modernize-use-bool-literals, - modernize-use-default-member-init, - modernize-use-emplace, - modernize-use-equals-delete, - modernize-use-nodiscard, - modernize-use-equals-default, - modernize-use-noexcept, - modernize-use-override, - modernize-use-nullptr, - modernize-use-transparent-functors, - modernize-use-uncaught-exceptions, - modernize-use-using, -' -WarningsAsErrors: '*' -HeaderFilterRegex: '.*' -AnalyzeTemporaryDtors: false -FormatStyle: none -CheckOptions: - - key: bugprone-assert-side-effect.AssertMacros - value: 'assert;Q_ASSERT' - - key: bugprone-dangling-handle.HandleClasses - value: 'std::basic_string_view;std::experimental::basic_string_view;QStringView' - - key: bugprone-sizeof-expression.WarnOnSizeOfIntegerExpression - value: 1 - - key: modernize-use-default-member-init.UseAssignment - value: 1 diff --git a/.drone.yml b/.drone.yml index 811f911f965d7..1fb3b31e60136 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-10 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-11 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-10 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-11 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-10 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-11 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-10 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-11 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-10 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-11 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-10 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-11 volumes: - name: build path: /drone/build @@ -72,13 +72,6 @@ steps: - useradd -m -s /bin/bash test - 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-10 - volumes: - - name: build - path: /drone/build - commands: - - "! run-clang-tidy-10 -j$(nproc) -p /drone/build -header-filter $PWD -quiet | grep -A 5 ': error:'" volumes: - name: build diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 9b10fdc61d29c..88378c1f5074c 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-10 + container: ghcr.io/nextcloud/continuous-integration-client:client-5.15-11 env: SONAR_SERVER_URL: "https://sonarcloud.io" BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed