From a1547a7d82e6951666eaafe2b67570e88c1b00f3 Mon Sep 17 00:00:00 2001 From: ClausKlein Date: Tue, 26 May 2026 11:03:11 +0200 Subject: [PATCH 1/3] Disable apple clang presets --- .pre-commit-config.yaml | 8 ++++---- CMakePresets.json | 10 +++++++--- README.md | 2 -- requirements.txt | 8 +++++--- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f81de31e..f7ffdc16 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -60,9 +60,9 @@ repos: - id: black # Beman Standard checking via beman-tidy - - repo : https://github.com/bemanproject/beman-tidy - rev: v0.3.1 - hooks: - - id: beman-tidy + # - repo : https://github.com/bemanproject/beman-tidy + # rev: v0.3.1 + # hooks: + # - id: beman-tidy exclude: 'infra/' diff --git a/CMakePresets.json b/CMakePresets.json index c4fcfd51..6efc249d 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -74,7 +74,6 @@ "_debug-base" ], "cacheVariables": { - "BEMAN_USE_STD_MODULE": true, "CMAKE_TOOLCHAIN_FILE": "infra/cmake/llvm-libc++-toolchain.cmake" }, "environment": { @@ -90,7 +89,6 @@ "_release-base" ], "cacheVariables": { - "BEMAN_USE_STD_MODULE": false, "CMAKE_TOOLCHAIN_FILE": "infra/cmake/llvm-libc++-toolchain.cmake" }, "environment": { @@ -100,6 +98,7 @@ }, { "name": "appleclang-debug", + "hidden": true, "displayName": "Appleclang Debug Build", "inherits": [ "_root-config", @@ -113,6 +112,7 @@ }, { "name": "appleclang-release", + "hidden": true, "displayName": "Appleclang Release Build", "inherits": [ "_root-config", @@ -161,7 +161,11 @@ { "name": "_root-build", "hidden": true, - "jobs": 0 + "jobs": 0, + "targets": [ + "all_verify_interface_header_sets", + "all" + ] }, { "name": "gcc-debug", diff --git a/README.md b/README.md index 8e038041..d9bb3a8e 100644 --- a/README.md +++ b/README.md @@ -73,8 +73,6 @@ The following instructions build the library and the examples: "gcc-release" "llvm-debug" "llvm-release" - "appleclang-debug" - "appleclang-release" "msvc-debug" "msvc-release" diff --git a/requirements.txt b/requirements.txt index eff0e1c7..878177a0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,12 +15,14 @@ pyaml ### cmake build context bump2version>=1.0.1 check-jsonschema>=0.36.1 -cmake>=4.2 +cmake>=4.3 codespell>=2.4.1 -# conan>=2.7.0 -gersemi>=0.25.4 +# conan>=2.26.2 +gersemi>=0.27.2 gcovr>=8.6 ninja>=1.13 yamllint>=1.38 beman_submodule +beman-local-ci +beman-tidy From f5579d574fb009c82aa14280a94ff87fba2234d1 Mon Sep 17 00:00:00 2001 From: ClausKlein Date: Tue, 26 May 2026 11:37:20 +0200 Subject: [PATCH 2/3] Prevent LLVM release build errors on LINUX --- CMakePresets.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakePresets.json b/CMakePresets.json index 6efc249d..61065330 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -74,6 +74,7 @@ "_debug-base" ], "cacheVariables": { + "BEMAN_USE_STD_MODULE": false, "CMAKE_TOOLCHAIN_FILE": "infra/cmake/llvm-libc++-toolchain.cmake" }, "environment": { @@ -89,6 +90,7 @@ "_release-base" ], "cacheVariables": { + "BEMAN_USE_STD_MODULE": false, "CMAKE_TOOLCHAIN_FILE": "infra/cmake/llvm-libc++-toolchain.cmake" }, "environment": { From 3c140440bb125df61ab8a75f60292455f570266a Mon Sep 17 00:00:00 2001 From: ClausKlein Date: Tue, 26 May 2026 12:25:46 +0200 Subject: [PATCH 3/3] Disable beman-tidy for now --- .pre-commit-config.yaml | 8 ++++---- src/beman/execution/CMakeLists.txt | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f7ffdc16..769beda1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -24,7 +24,7 @@ repos: # See also: https://github.com/ssciwr/clang-format-wheel # Config file: .clang-format - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v22.1.4 + rev: v22.1.5 hooks: - id: clang-format types_or: [c++, c, json, javascript] @@ -32,7 +32,7 @@ repos: # CMake linting and formatting - repo: https://github.com/BlankSpruce/gersemi-pre-commit - rev: 0.27.2 + rev: 0.27.6 hooks: - id: gersemi name: CMake linting @@ -55,13 +55,13 @@ repos: # Config file: pyproject.toml # second Python code formatting - repo: https://github.com/psf/black - rev: 26.3.1 + rev: 26.5.1 hooks: - id: black # Beman Standard checking via beman-tidy # - repo : https://github.com/bemanproject/beman-tidy - # rev: v0.3.1 + # rev: v0.5.1 # hooks: # - id: beman-tidy diff --git a/src/beman/execution/CMakeLists.txt b/src/beman/execution/CMakeLists.txt index 0a984af6..53bc65ba 100644 --- a/src/beman/execution/CMakeLists.txt +++ b/src/beman/execution/CMakeLists.txt @@ -222,8 +222,7 @@ target_sources( if(BEMAN_USE_MODULES) target_sources( ${BEMAN_EXECUTION_TARGET_PREFIX} - PRIVATE - execution.cpp # TODO(CK): check if really needed! + PRIVATE execution.cpp # TODO(CK): check if really needed! PUBLIC FILE_SET CXX_MODULES FILES