From c8f9d5986f3ceb9b43df4cfe7b3616f793aefd0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Darius=20Nea=C8=9Bu?= Date: Thu, 9 Jul 2026 22:57:00 +0300 Subject: [PATCH 1/2] Enable beman-tidy --require-all with readme.implements disabled Disable readme.implements until P3610 is published on WG21, keep the local papers/scope.org link in README, add SPDX headers for file.license_id, and bump beman-tidy to v0.4.1 for disabled_rules support. Co-authored-by: Cursor --- .beman-tidy.yaml | 10 ++++++++++ .github/workflows/pre-commit.yml | 1 + .markdownlint.yaml | 1 + .pre-commit-config.yaml | 4 +++- cmake/beman.scope-config.cmake | 1 + infra/.github/workflows/pre-commit.yml | 1 + infra/.pre-commit-config.yaml | 1 + infra/.pre-commit-hooks.yaml | 1 + infra/cmake/use-fetch-content.cmake | 1 + 9 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 .beman-tidy.yaml diff --git a/.beman-tidy.yaml b/.beman-tidy.yaml new file mode 100644 index 0000000..c62bc01 --- /dev/null +++ b/.beman-tidy.yaml @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception + +# This is the config file for beman-tidy, which checks compliance with the Beman Standard (https://github.com/bemanproject/beman/blob/main/docs/beman_standard.md) +# Check documentation for beman-tidy here: +# https://github.com/bemanproject/beman-tidy/blob/main/README.md + +disabled_rules: + - readme.implements # P3610 is not yet published on WG21; local draft is in papers/scope.org + +ignored_paths: [] diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 2409d2f..834b4c1 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception name: Lint Check (pre-commit) on: diff --git a/.markdownlint.yaml b/.markdownlint.yaml index 21c2849..48269b5 100644 --- a/.markdownlint.yaml +++ b/.markdownlint.yaml @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # MD033/no-inline-html : Inline HTML : https://github.com/DavidAnson/markdownlint/blob/v0.35.0/doc/md033.md # Disable inline html linter is needed for
MD033: false diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e66db0f..0d6e49a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # See https://pre-commit.com for more information # See https://pre-commit.com/hooks.html for more hooks repos: @@ -43,8 +44,9 @@ repos: # Beman Standard checking via beman-tidy - repo: https://github.com/bemanproject/beman-tidy - rev: v0.4.0 + rev: v0.4.1 hooks: - id: beman-tidy + args: [".", "--verbose", "--require-all"] exclude: 'infra/' diff --git a/cmake/beman.scope-config.cmake b/cmake/beman.scope-config.cmake index e4102c5..25b63f2 100644 --- a/cmake/beman.scope-config.cmake +++ b/cmake/beman.scope-config.cmake @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception include(${CMAKE_CURRENT_LIST_DIR}/beman.scope-targets.cmake) foreach(comp IN LISTS beman.scope_FIND_COMPONENTS) diff --git a/infra/.github/workflows/pre-commit.yml b/infra/.github/workflows/pre-commit.yml index 9646831..7051c13 100644 --- a/infra/.github/workflows/pre-commit.yml +++ b/infra/.github/workflows/pre-commit.yml @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception name: Lint Check (pre-commit) on: diff --git a/infra/.pre-commit-config.yaml b/infra/.pre-commit-config.yaml index e806e59..8949c4f 100644 --- a/infra/.pre-commit-config.yaml +++ b/infra/.pre-commit-config.yaml @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception repos: - repo: https://github.com/pre-commit/pre-commit-hooks rev: v6.0.0 diff --git a/infra/.pre-commit-hooks.yaml b/infra/.pre-commit-hooks.yaml index d327587..25907c8 100644 --- a/infra/.pre-commit-hooks.yaml +++ b/infra/.pre-commit-hooks.yaml @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - id: beman-tidy name: "beman-tidy: bemanification your repo" entry: ./tools/beman-tidy/beman-tidy diff --git a/infra/cmake/use-fetch-content.cmake b/infra/cmake/use-fetch-content.cmake index 4ed4839..88db318 100644 --- a/infra/cmake/use-fetch-content.cmake +++ b/infra/cmake/use-fetch-content.cmake @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception cmake_minimum_required(VERSION 3.24) include(FetchContent) From 7549831f3e3d6dc82092d3d128db49adf0377864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Darius=20Nea=C8=9Bu?= Date: Thu, 9 Jul 2026 23:00:36 +0300 Subject: [PATCH 2/2] Fix beman-submodule check by reverting infra edits Ignore infra/ in .beman-tidy.yaml instead of patching vendored infra files, which broke the beman-submodule consistency check in CI. --- .beman-tidy.yaml | 3 ++- infra/.github/workflows/pre-commit.yml | 1 - infra/.pre-commit-config.yaml | 1 - infra/.pre-commit-hooks.yaml | 1 - infra/cmake/use-fetch-content.cmake | 1 - 5 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.beman-tidy.yaml b/.beman-tidy.yaml index c62bc01..fd6ee16 100644 --- a/.beman-tidy.yaml +++ b/.beman-tidy.yaml @@ -7,4 +7,5 @@ disabled_rules: - readme.implements # P3610 is not yet published on WG21; local draft is in papers/scope.org -ignored_paths: [] +ignored_paths: + - infra/ diff --git a/infra/.github/workflows/pre-commit.yml b/infra/.github/workflows/pre-commit.yml index 7051c13..9646831 100644 --- a/infra/.github/workflows/pre-commit.yml +++ b/infra/.github/workflows/pre-commit.yml @@ -1,4 +1,3 @@ -# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception name: Lint Check (pre-commit) on: diff --git a/infra/.pre-commit-config.yaml b/infra/.pre-commit-config.yaml index 8949c4f..e806e59 100644 --- a/infra/.pre-commit-config.yaml +++ b/infra/.pre-commit-config.yaml @@ -1,4 +1,3 @@ -# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception repos: - repo: https://github.com/pre-commit/pre-commit-hooks rev: v6.0.0 diff --git a/infra/.pre-commit-hooks.yaml b/infra/.pre-commit-hooks.yaml index 25907c8..d327587 100644 --- a/infra/.pre-commit-hooks.yaml +++ b/infra/.pre-commit-hooks.yaml @@ -1,4 +1,3 @@ -# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - id: beman-tidy name: "beman-tidy: bemanification your repo" entry: ./tools/beman-tidy/beman-tidy diff --git a/infra/cmake/use-fetch-content.cmake b/infra/cmake/use-fetch-content.cmake index 88db318..4ed4839 100644 --- a/infra/cmake/use-fetch-content.cmake +++ b/infra/cmake/use-fetch-content.cmake @@ -1,4 +1,3 @@ -# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception cmake_minimum_required(VERSION 3.24) include(FetchContent)