Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Combine cmake and c++ linter in one job #185

Merged
merged 8 commits into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 0 additions & 29 deletions .github/workflows/cmake-format-linter.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
name: cpp-linter
name: Run all linters

on:
on:
pull_request:
branches: [master]

branches: [ master, develop ]
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
cpp-linter:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.head_ref }}
token: ${{ secrets.LINTER_PAT }}

- name: Install clang-format
if: inputs.apply_clang_format
Expand All @@ -28,6 +30,12 @@ jobs:
run:
echo "branchName=$GITHUB_BASE_REF" >> $GITHUB_OUTPUT

- name: Format CMake files
id: cmake-format
uses: PuneetMatharu/[email protected]
with:
args: --config-files .cmake-format.py --in-place

- name: Define base git diff args
id: git-diff-args
run: |
Expand Down
1 change: 1 addition & 0 deletions src/minimizer/LibCMAES/MinimizeLibCMAES.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ namespace BSMPT
namespace Minimizer
{
namespace LibCMAES

{

using namespace libcmaes;
Expand Down
1 change: 1 addition & 0 deletions tools/cmake/CodeCoverage.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ get_property(LANGUAGES GLOBAL PROPERTY ENABLED_LANGUAGES)
list(GET LANGUAGES 0 LANG)

if("${CMAKE_${LANG}_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang")

if("${CMAKE_${LANG}_COMPILER_VERSION}" VERSION_LESS 3)
message(FATAL_ERROR "Clang version must be 3.0.0 or greater! Aborting...")
endif()
Expand Down
Loading