From d698dc214ea793347f85bdd14023fc3bc422824f Mon Sep 17 00:00:00 2001 From: Edward Nolan Date: Sun, 24 May 2026 19:30:07 -0400 Subject: [PATCH] Exemplar updates since 2026-05-01 Added missing SPDX-License-Identifier headers to pre-commit-check.yml, .markdownlint.yaml, .pre-commit-config.yaml, CONTRIBUTING.md, and port/portfile.cmake.in. Updated beman-submodule commit hash to 9bd493ce12ba5b7b01bc777f35d1e08a16889a90. Added .beman-tidy.yaml config file for beman-tidy Beman Standard compliance checks. Bumped beman-submodule commit hash to 66b4f0cdf527cb66bfe2f009f0d2b0ceb56d2cd0 to support modules. Bumped vcpkg registry baselines (microsoft/vcpkg and bemanproject/vcpkg-registry) in vcpkg-configuration.json. 3485869: Add missing SPDX-License-Identifier to include/beman/transform_view/config.hpp Bumped infra/ beman-submodule to add SPDX-License-Identifier in enable-experimental-import-std.cmake Bumped infra-workflows references from 1.7.1 to 1.7.2 in all CI workflows (code coverage job fix). Added concurrency group with cancel-in-progress to ci_tests.yml to kill prior runs on new push. Bumped infra beman-submodule to support CMake 4.3.3, updated CODEOWNERS, and added 4.3.3 case to enable-experimental-import-std.cmake. Bumped infra-workflows references from 1.7.2 to 1.7.3 in all CI workflows (pins CMake version for MSVC/AppleClang CI jobs). Bumped pre-commit hooks: gersemi 0.27.4 -> 0.27.6 and beman-tidy v0.4.1 -> v0.5.0. Updated README.md badges to link to their CI workflows / maturity model doc, and place each badge on its own line. Bumped beman-tidy pre-commit hook version from v0.5.0 to v0.5.1. Removed redundant note about include search path modification from README.md. Bumped vcpkg-registry baseline in vcpkg-configuration.json to e1aa5c3c2a46486cc1384d70beab939d76bfe128. Bumped microsoft/vcpkg baseline in vcpkg-configuration.json to aa40adda5352e87655b8583cfb2451d5e9e276fd. --- .beman-tidy.yaml | 10 ++++++++++ .exemplar_version | 2 +- .github/workflows/ci_tests.yml | 14 +++++++++----- .github/workflows/pre-commit-check.yml | 3 ++- .github/workflows/pre-commit-update.yml | 2 +- .github/workflows/vcpkg-release.yml | 2 +- .markdownlint.yaml | 1 + .pre-commit-config.yaml | 5 +++-- CONTRIBUTING.md | 4 ++++ README.md | 15 +++++++-------- include/beman/transform_view/config.hpp | 2 ++ infra/.beman_submodule | 2 +- infra/.github/CODEOWNERS | 2 +- infra/cmake/enable-experimental-import-std.cmake | 5 +++++ port/portfile.cmake.in | 1 + vcpkg-configuration.json | 4 ++-- 16 files changed, 51 insertions(+), 23 deletions(-) create mode 100644 .beman-tidy.yaml diff --git a/.beman-tidy.yaml b/.beman-tidy.yaml new file mode 100644 index 0000000..24d798b --- /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: + # None +ignored_paths: + # None diff --git a/.exemplar_version b/.exemplar_version index 1fe9d8b..14f6221 100644 --- a/.exemplar_version +++ b/.exemplar_version @@ -1 +1 @@ -07a42c8a3ace7b889d4d98df8f9ec3a4cf74887f +ec861600898941a5114f352f1efcba57d825b6d0 diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 86a9a50..91dea20 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -11,12 +11,16 @@ on: schedule: - cron: '9 13 * * 5' +concurrency: + group: ${{format('{0}:{1}', github.repository, github.ref)}} + cancel-in-progress: true + jobs: beman-submodule-check: - uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-submodule-check.yml@1.7.1 + uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-submodule-check.yml@1.7.3 preset-test: - uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-preset-test.yml@1.7.1 + uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-preset-test.yml@1.7.3 with: matrix_config: > [ @@ -31,7 +35,7 @@ jobs: ] build-and-test: - uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-build-and-test.yml@1.7.1 + uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-build-and-test.yml@1.7.3 with: matrix_config: > { @@ -152,7 +156,7 @@ jobs: } vcpkg-ci: - uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-ci.yml@1.7.1 + uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-ci.yml@1.7.3 with: port_name: beman-transform-view feature_combinations: | @@ -164,4 +168,4 @@ jobs: create-issue-when-fault: needs: [preset-test, build-and-test] if: failure() && github.event_name == 'schedule' - uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-create-issue-when-fault.yml@1.7.1 + uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-create-issue-when-fault.yml@1.7.3 diff --git a/.github/workflows/pre-commit-check.yml b/.github/workflows/pre-commit-check.yml index b429ecf..f55ccea 100644 --- a/.github/workflows/pre-commit-check.yml +++ b/.github/workflows/pre-commit-check.yml @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception name: Lint Check (pre-commit) on: @@ -10,4 +11,4 @@ on: jobs: pre-commit: - uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-pre-commit.yml@1.7.1 + uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-pre-commit.yml@1.7.3 diff --git a/.github/workflows/pre-commit-update.yml b/.github/workflows/pre-commit-update.yml index 995dd18..5b8f948 100644 --- a/.github/workflows/pre-commit-update.yml +++ b/.github/workflows/pre-commit-update.yml @@ -9,7 +9,7 @@ on: jobs: auto-update-pre-commit: - uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-update-pre-commit.yml@1.7.1 + uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-update-pre-commit.yml@1.7.3 secrets: APP_ID: ${{ secrets.AUTO_PR_BOT_APP_ID }} PRIVATE_KEY: ${{ secrets.AUTO_PR_BOT_PRIVATE_KEY }} diff --git a/.github/workflows/vcpkg-release.yml b/.github/workflows/vcpkg-release.yml index 30fbb69..f45c7cc 100644 --- a/.github/workflows/vcpkg-release.yml +++ b/.github/workflows/vcpkg-release.yml @@ -6,7 +6,7 @@ on: types: [published] jobs: vcpkg-release: - uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-release.yml@1.7.1 + uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-release.yml@1.7.3 with: port_name: beman-transform-view secrets: 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 de649f8..d609eab 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: @@ -20,7 +21,7 @@ repos: # CMake linting and formatting - repo: https://github.com/BlankSpruce/gersemi-pre-commit - rev: 0.27.4 + rev: 0.27.6 hooks: - id: gersemi name: CMake linting @@ -41,7 +42,7 @@ repos: # Beman Standard checking via beman-tidy - repo: https://github.com/bemanproject/beman-tidy - rev: v0.4.1 + rev: v0.5.1 hooks: - id: beman-tidy diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fa27f7e..cd1dfd6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,3 +1,7 @@ + + # Development ## Configure and Build the Project Using CMake Presets diff --git a/README.md b/README.md index fe077d1..2413236 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,13 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception --> - -![Library Status](https://raw.githubusercontent.com/bemanproject/beman/refs/heads/main/images/badges/beman_badge-beman_library_under_development.svg) ![Continuous Integration Tests](https://github.com/bemanproject/transform_view/actions/workflows/ci_tests.yml/badge.svg) ![Lint Check (pre-commit)](https://github.com/bemanproject/transform_view/actions/workflows/pre-commit-check.yml/badge.svg) [![Coverage](https://coveralls.io/repos/github/bemanproject/transform_view/badge.svg?branch=main)](https://coveralls.io/github/bemanproject/transform_view?branch=main) ![Standard Target](https://github.com/bemanproject/beman/blob/main/images/badges/cpp29.svg) + +[![Library Status](https://raw.githubusercontent.com/bemanproject/beman/refs/heads/main/images/badges/beman_badge-beman_library_under_development.svg)](https://github.com/bemanproject/beman/blob/main/docs/beman_library_maturity_model.md#the-beman-library-maturity-model) +[![Continuous Integration Tests](https://github.com/bemanproject/transform_view/actions/workflows/ci_tests.yml/badge.svg)](https://github.com/bemanproject/transform_view/actions/workflows/ci_tests.yml) +[![Lint Check (pre-commit)](https://github.com/bemanproject/transform_view/actions/workflows/pre-commit-check.yml/badge.svg)](https://github.com/bemanproject/transform_view/actions/workflows/pre-commit-check.yml) +[![Coverage](https://coveralls.io/repos/github/bemanproject/transform_view/badge.svg?branch=main)](https://coveralls.io/github/bemanproject/transform_view?branch=main) +![Standard Target](https://github.com/bemanproject/beman/blob/main/images/badges/cpp29.svg) + **Implements**: [`transform_view` (P3117R0)](https://wg21.link/P3117R0) @@ -174,12 +179,6 @@ include an appropriate `beman.transform_view` header from your source code. #include ``` -> [!NOTE] -> -> `beman.transform_view` headers are to be included with the `beman/transform_view/` prefix. -> Altering include search paths to spell the include target another way (e.g. -> `#include `) is unsupported. - ### Project specific configure arguments Project-specific options are prefixed with `BEMAN_TRANSFORM_VIEW`. diff --git a/include/beman/transform_view/config.hpp b/include/beman/transform_view/config.hpp index 88e5d00..7f2ee51 100644 --- a/include/beman/transform_view/config.hpp +++ b/include/beman/transform_view/config.hpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception + #ifndef BEMAN_TRANSFORM_VIEW_CONFIG_HPP #define BEMAN_TRANSFORM_VIEW_CONFIG_HPP diff --git a/infra/.beman_submodule b/infra/.beman_submodule index f6970c1..a24c23d 100644 --- a/infra/.beman_submodule +++ b/infra/.beman_submodule @@ -1,3 +1,3 @@ [beman_submodule] remote=https://github.com/bemanproject/infra.git -commit_hash=66b4f0cdf527cb66bfe2f009f0d2b0ceb56d2cd0 +commit_hash=d536fc285ae058cf8f5b736b5ff73d18a421b296 diff --git a/infra/.github/CODEOWNERS b/infra/.github/CODEOWNERS index 4ff90a4..439303d 100644 --- a/infra/.github/CODEOWNERS +++ b/infra/.github/CODEOWNERS @@ -1 +1 @@ -* @ednolan @neatudarius @rishyak @wusatosi @JeffGarland +* @ednolan @rishyak @wusatosi @JeffGarland diff --git a/infra/cmake/enable-experimental-import-std.cmake b/infra/cmake/enable-experimental-import-std.cmake index 7e8aa26..0ac9604 100644 --- a/infra/cmake/enable-experimental-import-std.cmake +++ b/infra/cmake/enable-experimental-import-std.cmake @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception if(CMAKE_VERSION VERSION_EQUAL "3.30.0") set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD "0e5b6991-d74f-4b3d-a41c-cf096e0b2508" @@ -186,4 +187,8 @@ elseif(CMAKE_VERSION VERSION_EQUAL "4.3.2") set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD "451f2fe2-a8a2-47c3-bc32-94786d8fc91b" ) +elseif(CMAKE_VERSION VERSION_EQUAL "4.3.3") + set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD + "451f2fe2-a8a2-47c3-bc32-94786d8fc91b" + ) endif() diff --git a/port/portfile.cmake.in b/port/portfile.cmake.in index 1cd2bf5..5c228a4 100644 --- a/port/portfile.cmake.in +++ b/port/portfile.cmake.in @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bemanproject/transform_view diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index 25169b2..0924600 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -2,13 +2,13 @@ "default-registry": { "kind": "git", "repository": "https://github.com/microsoft/vcpkg.git", - "baseline": "80f9bcfa455e875d9c1bf7a7c6692d7e1e481061" + "baseline": "aa40adda5352e87655b8583cfb2451d5e9e276fd" }, "registries": [ { "kind": "git", "repository": "https://github.com/bemanproject/vcpkg-registry.git", - "baseline": "5195f94f2b550163917c1152180fc59bbd760556", + "baseline": "e1aa5c3c2a46486cc1384d70beab939d76bfe128", "packages": ["beman-*"] } ]