Skip to content

Commit 1d6228d

Browse files
AndreiDurleaAndreiDurlea
authored
Merge branch 'main' into 388-windows-users-cannot-run-stampsh-without-wsl
2 parents f1cad19 + ec86160 commit 1d6228d

25 files changed

Lines changed: 67 additions & 50 deletions

‎.github/workflows/ci_tests.yml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,16 @@ on:
1111
schedule:
1212
- cron: '30 15 * * 6'
1313

14+
concurrency:
15+
group: ${{format('{0}:{1}', github.repository, github.ref)}}
16+
cancel-in-progress: true
17+
1418
jobs:
1519
beman-submodule-check:
16-
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-submodule-check.yml@1.7.1
20+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-submodule-check.yml@1.7.3
1721

1822
preset-test:
19-
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-preset-test.yml@1.7.1
23+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-preset-test.yml@1.7.3
2024
with:
2125
matrix_config: >
2226
[
@@ -31,7 +35,7 @@ jobs:
3135
]
3236
3337
build-and-test:
34-
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-build-and-test.yml@1.7.1
38+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-build-and-test.yml@1.7.3
3539
with:
3640
matrix_config: >
3741
{
@@ -183,7 +187,7 @@ jobs:
183187
}
184188
185189
vcpkg-ci:
186-
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-ci.yml@1.7.1
190+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-ci.yml@1.7.3
187191
with:
188192
port_name: beman-exemplar
189193
feature_combinations: |
@@ -195,4 +199,4 @@ jobs:
195199
create-issue-when-fault:
196200
needs: [preset-test, build-and-test]
197201
if: failure() && github.event_name == 'schedule'
198-
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-create-issue-when-fault.yml@1.7.1
202+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-create-issue-when-fault.yml@1.7.3

‎.github/workflows/pre-commit-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ permissions:
1717

1818
jobs:
1919
pre-commit:
20-
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-pre-commit.yml@1.7.1
20+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-pre-commit.yml@1.7.3

‎.github/workflows/pre-commit-update.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
jobs:
1111
auto-update-pre-commit:
12-
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-update-pre-commit.yml@1.7.1
12+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-update-pre-commit.yml@1.7.3
1313
secrets:
1414
APP_ID: ${{ secrets.AUTO_PR_BOT_APP_ID }}
1515
PRIVATE_KEY: ${{ secrets.AUTO_PR_BOT_PRIVATE_KEY }}

‎.github/workflows/vcpkg-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
types: [published]
77
jobs:
88
vcpkg-release:
9-
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-release.yml@1.7.1
9+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-release.yml@1.7.3
1010
with:
1111
port_name: beman-exemplar
1212
secrets:

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ repos:
1414
# This brings in a portable version of clang-format.
1515
# See also: https://github.com/ssciwr/clang-format-wheel
1616
- repo: https://github.com/pre-commit/mirrors-clang-format
17-
rev: v22.1.4
17+
rev: v22.1.5
1818
hooks:
1919
- id: clang-format
2020
types_or: [c++, c]
2121

2222
# CMake linting and formatting
2323
- repo: https://github.com/BlankSpruce/gersemi-pre-commit
24-
rev: 0.27.2
24+
rev: 0.27.6
2525
hooks:
2626
- id: gersemi
2727
name: CMake linting

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ project(
88
beman.exemplar
99
DESCRIPTION "A Beman Library Exemplar"
1010
LANGUAGES CXX
11-
VERSION 2.4.0
11+
VERSION 2.4.1
1212
)
1313

1414
# [CMAKE.SKIP_TESTS]

‎README.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,14 @@ What follow is an example of a Beman library README.
4343
SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
4444
-->
4545

46-
<!-- markdownlint-disable-next-line line-length -->
47-
![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/exemplar/actions/workflows/ci_tests.yml/badge.svg) ![Lint Check (pre-commit)](https://github.com/bemanproject/exemplar/actions/workflows/pre-commit-check.yml/badge.svg) [![Coverage](https://coveralls.io/repos/github/bemanproject/exemplar/badge.svg?branch=main)](https://coveralls.io/github/bemanproject/exemplar?branch=main) ![Standard Target](https://github.com/bemanproject/beman/blob/main/images/badges/cpp29.svg) [![Compiler Explorer Example](https://img.shields.io/badge/Try%20it%20on%20Compiler%20Explorer-grey?logo=compilerexplorer&logoColor=67c52a)](https://godbolt.org/z/4qEPK87va)
46+
<!-- markdownlint-disable line-length -->
47+
[![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)
48+
[![Continuous Integration Tests](https://github.com/bemanproject/exemplar/actions/workflows/ci_tests.yml/badge.svg)](https://github.com/bemanproject/exemplar/actions/workflows/ci_tests.yml)
49+
[![Lint Check (pre-commit)](https://github.com/bemanproject/exemplar/actions/workflows/pre-commit-check.yml/badge.svg)](https://github.com/bemanproject/exemplar/actions/workflows/pre-commit-check.yml)
50+
[![Coverage](https://coveralls.io/repos/github/bemanproject/exemplar/badge.svg?branch=main)](https://coveralls.io/github/bemanproject/exemplar?branch=main)
51+
![Standard Target](https://github.com/bemanproject/beman/blob/main/images/badges/cpp29.svg)
52+
[![Compiler Explorer Example](https://img.shields.io/badge/Try%20it%20on%20Compiler%20Explorer-grey?logo=compilerexplorer&logoColor=67c52a)](https://godbolt.org/z/4qEPK87va)
53+
<!-- markdownlint-restore -->
4854

4955
`beman.exemplar` is a minimal C++ library conforming to [The Beman Standard](https://github.com/bemanproject/beman/blob/main/docs/beman_standard.md).
5056
This can be used as a template for those intending to write Beman libraries.
@@ -243,9 +249,3 @@ include an appropriate `beman.exemplar` header from your source code.
243249
```c++
244250
#include <beman/exemplar/exemplar.hpp>
245251
```
246-
247-
> [!NOTE]
248-
>
249-
> `beman.exemplar` headers are to be included with the `beman/exemplar/` prefix.
250-
> Altering include search paths to spell the include target another way (e.g.
251-
> `#include <exemplar.hpp>`) is unsupported.

‎cookiecutter/{{cookiecutter.project_name}}/.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
22

33
{% if cookiecutter._generating_exemplar %}
4-
* @ednolan @bretbrownjr @camio @dietmarkuehl @neatudarius @steve-downey @wusatosi
4+
* @ednolan @bretbrownjr @camio @dietmarkuehl @steve-downey @wusatosi
55
{% else %}
66
* @{{ cookiecutter.maintainer }}
77
{% endif %}

‎cookiecutter/{{cookiecutter.project_name}}/.github/workflows/ci_tests.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,17 @@ on:
1111
schedule:
1212
- cron: '{% if cookiecutter._ci_tests_cron %}{{ cookiecutter._ci_tests_cron }}{% else %}{{ range(0, 60) | random }} {{ range(13, 18) | random }} * * {{ range(0, 7) | random }}{% endif %}'
1313

14+
concurrency:
15+
group: {% raw %}${{format('{0}:{1}', github.repository, github.ref)}}{% endraw %}
16+
17+
cancel-in-progress: true
18+
1419
jobs:
1520
beman-submodule-check:
16-
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-submodule-check.yml@1.7.1
21+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-submodule-check.yml@1.7.3
1722

1823
preset-test:
19-
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-preset-test.yml@1.7.1
24+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-preset-test.yml@1.7.3
2025
with:
2126
matrix_config: >
2227
[
@@ -31,7 +36,7 @@ jobs:
3136
]
3237
3338
build-and-test:
34-
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-build-and-test.yml@1.7.1
39+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-build-and-test.yml@1.7.3
3540
with:
3641
matrix_config: >
3742
{
@@ -183,7 +188,7 @@ jobs:
183188
}
184189
185190
vcpkg-ci:
186-
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-ci.yml@1.7.1
191+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-ci.yml@1.7.3
187192
with:
188193
port_name: beman-{{cookiecutter.project_name.replace('_', '-')}}
189194
feature_combinations: |
@@ -195,4 +200,4 @@ jobs:
195200
create-issue-when-fault:
196201
needs: [preset-test, build-and-test]
197202
if: failure() && github.event_name == 'schedule'
198-
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-create-issue-when-fault.yml@1.7.1
203+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-create-issue-when-fault.yml@1.7.3

‎cookiecutter/{{cookiecutter.project_name}}/.github/workflows/pre-commit-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ permissions:
1717

1818
jobs:
1919
pre-commit:
20-
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-pre-commit.yml@1.7.1
20+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-pre-commit.yml@1.7.3

0 commit comments

Comments
 (0)