diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | CMakePresets.json | 20 | ||||
| -rw-r--r-- | bitbucket-pipelines.yml | 46 |
3 files changed, 40 insertions, 27 deletions
@@ -14,6 +14,7 @@ debug.log .cache compile_commands.json cmake-build-debug/ +cmake-build-devel/ cmake-build-coverage/ cmake-build-release/ src/settings/rekonqrc diff --git a/CMakePresets.json b/CMakePresets.json index b36af7d3..ec578a09 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -9,6 +9,7 @@ "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", + "CMAKE_CXX_COMPILER": "g++", "CMAKE_CXX_FLAGS": "-Wall -Wextra -Wpedantic -Werror=shadow -Werror=non-virtual-dtor", "CMAKE_CXX_FLAGS_DEBUG": "-g -Og", "CMAKE_CXX_STANDARD": "20", @@ -19,13 +20,17 @@ } }, { + "name": "devel", + "inherits": "debug", + "description": "Debug build with clazy", + "binaryDir": "${sourceDir}/cmake-build-devel", + "cacheVariables": { "CMAKE_CXX_COMPILER": "clazy" } + }, + { "name": "coverage", "inherits": "debug", "binaryDir": "${sourceDir}/cmake-build-coverage", - "cacheVariables": { - "BUILD_COVERAGE": "ON", - "CMAKE_CXX_CLANG_TIDY": "" - } + "cacheVariables": { "BUILD_COVERAGE": "ON" } }, { "name": "release", @@ -44,6 +49,7 @@ ], "buildPresets": [ { "name": "debug", "configurePreset": "debug" }, + { "name": "devel", "configurePreset": "devel" }, { "name": "release", "configurePreset": "release" } ], "testPresets": [ @@ -54,8 +60,10 @@ "execution": { "stopOnFailure": false } }, { - "name": "release", - "configurePreset": "release" + "name": "devel", + "configurePreset": "devel", + "output": { "outputOnFailure": true }, + "execution": { "stopOnFailure": false } } ] } diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 654fc772..0b937bd8 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -1,36 +1,40 @@ pipelines: default: + - step: + name: Static checks + runs-on: + - 'self.hosted' + - 'linux.shell' + script: + - python --version + - pylint scripts/check_license.py + - pylint scripts/rekonf.py + - pylint scripts/qrc_lint.py + - git submodule update --init --depth=1 + - cmake --preset debug -GNinja + - git ls-files | grep '\.qrc$' | xargs -n1 ./scripts/qrc_lint.py + - ninja -C cmake-build-debug rekonq_check_license - parallel: - step: - name: pylint + name: Debug Build and Test runs-on: - 'self.hosted' - 'linux.shell' script: - - python --version - - pylint scripts/check_license.py - - pylint scripts/rekonf.py - - pylint scripts/qrc_lint.py + - git submodule update --init --depth=1 + - cmake --preset debug -GNinja + - cmake --build --preset debug + - ctest --preset debug --output-junit test-results/all.xml - step: - name: Static checks + name: Devel Build and Test runs-on: - 'self.hosted' - 'linux.shell' script: - - git submodule update --init - - cmake --preset debug -GNinja - - ninja -C cmake-build-debug rekonq_check_license - - git ls-files | grep '\.qrc$' | xargs -n1 ./scripts/qrc_lint.py - - step: - name: Debug Build and Test - runs-on: - - 'self.hosted' - - 'linux.shell' - script: - - git submodule update --init - - cmake --preset debug -GNinja - - cmake --build --preset debug - - ctest --preset debug --output-junit test-results/all.xml + - git submodule update --init --depth=1 + - cmake --preset devel -GNinja + - cmake --build --preset devel + - ctest --preset devel --output-junit test-results/all.xml pull-requests: '**': # for all branches - step: @@ -39,7 +43,7 @@ pipelines: - 'self.hosted' - 'linux.shell' script: - - git submodule update --init + - git submodule update --init --depth=1 - cmake --preset release -GNinja - cmake --build --preset release - clang-tidy -p cmake-build-release $(git diff origin/$BITBUCKET_PR_DESTINATION_BRANCH --name-only --diff-filter=AM | grep -E '\.(h|hpp|cpp)$') |