Skip to content

Commit ae17fbb

Browse files
steve-downeysteve-downey
committed
Merge remote-tracking branch 'upstream/main' into copier
# Conflicts: # cookiecutter/check_cookiecutter.sh # cookiecutter/{{cookiecutter.project_name}}/CMakeLists.txt
2 parents a44a299 + 32b69bd commit ae17fbb

13 files changed

Lines changed: 27 additions & 27 deletions

‎.github/workflows/ci_tests.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ concurrency:
1717

1818
jobs:
1919
beman-submodule-check:
20-
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-submodule-check.yml@1.7.3
20+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-submodule-check.yml@1.7.4
2121

2222
copier-test:
2323
runs-on: ubuntu-latest
@@ -75,7 +75,7 @@ jobs:
7575
# Run across our experimental boundaries
7676
run: ./copier/test_cmake_matrix.sh gcc-release ${{ matrix.cmake_version }}
7777
preset-test:
78-
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-preset-test.yml@1.7.3
78+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-preset-test.yml@1.7.4
7979
with:
8080
matrix_config: >
8181
[
@@ -90,7 +90,7 @@ jobs:
9090
]
9191
9292
build-and-test:
93-
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-build-and-test.yml@1.7.3
93+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-build-and-test.yml@1.7.4
9494
with:
9595
matrix_config: >
9696
{
@@ -242,7 +242,7 @@ jobs:
242242
}
243243
244244
vcpkg-ci:
245-
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-ci.yml@1.7.3
245+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-ci.yml@1.7.4
246246
with:
247247
port_name: beman-exemplar
248248
feature_combinations: |
@@ -254,4 +254,4 @@ jobs:
254254
create-issue-when-fault:
255255
needs: [preset-test, build-and-test]
256256
if: failure() && github.event_name == 'schedule'
257-
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-create-issue-when-fault.yml@1.7.3
257+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-create-issue-when-fault.yml@1.7.4

‎.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.3
20+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-pre-commit.yml@1.7.4

‎.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.3
12+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-update-pre-commit.yml@1.7.4
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.3
9+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-release.yml@1.7.4
1010
with:
1111
port_name: beman-exemplar
1212
secrets:

‎.pre-commit-config.yaml‎

Lines changed: 3 additions & 3 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.5
17+
rev: v22.1.8
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.6
24+
rev: 0.28.0
2525
hooks:
2626
- id: gersemi
2727
name: CMake linting
@@ -36,7 +36,7 @@ repos:
3636
# - id: markdownlint
3737

3838
- repo: https://github.com/codespell-project/codespell
39-
rev: v2.4.2
39+
rev: v2.4.3
4040
hooks:
4141
- id: codespell
4242

‎CMakeLists.txt‎

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

3-
cmake_minimum_required(VERSION 3.30...4.3)
3+
cmake_minimum_required(VERSION 3.30...4.4)
44

55
include(infra/cmake/enable-experimental-import-std.cmake)
66

‎lockfile.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"name": "googletest",
55
"package_name": "GTest",
66
"git_repository": "https://github.com/google/googletest.git",
7-
"git_tag": "6910c9d9165801d8827d628cb72eb7ea9dd538c5",
7+
"git_tag": "52eb8108c5bdec04579160ae17225d66034bd723",
88
"cmake_args": {
99
"INSTALL_GTEST": "OFF"
1010
}

‎template/.github/workflows/ci_tests.yml.jinja‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ concurrency:
1818

1919
jobs:
2020
beman-submodule-check:
21-
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-submodule-check.yml@1.7.3
21+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-submodule-check.yml@1.7.4
2222

2323
{% if generating_exemplar %}
2424
copier-test:
@@ -79,7 +79,7 @@ jobs:
7979

8080
{% endif %}
8181
preset-test:
82-
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-preset-test.yml@1.7.3
82+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-preset-test.yml@1.7.4
8383
with:
8484
matrix_config: >
8585
[
@@ -94,7 +94,7 @@ jobs:
9494
]
9595

9696
build-and-test:
97-
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-build-and-test.yml@1.7.3
97+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-build-and-test.yml@1.7.4
9898
with:
9999
matrix_config: >
100100
{
@@ -246,7 +246,7 @@ jobs:
246246
}
247247

248248
vcpkg-ci:
249-
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-ci.yml@1.7.3
249+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-ci.yml@1.7.4
250250
with:
251251
port_name: beman-{{project_name.replace('_', '-')}}
252252
feature_combinations: |
@@ -258,4 +258,4 @@ jobs:
258258
create-issue-when-fault:
259259
needs: [preset-test, build-and-test]
260260
if: failure() && github.event_name == 'schedule'
261-
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-create-issue-when-fault.yml@1.7.3
261+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-create-issue-when-fault.yml@1.7.4

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

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.3
20+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-pre-commit.yml@1.7.4

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
{% raw -%}
1111
jobs:
1212
auto-update-pre-commit:
13-
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-update-pre-commit.yml@1.7.3
13+
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-update-pre-commit.yml@1.7.4
1414
secrets:
1515
APP_ID: ${{ secrets.AUTO_PR_BOT_APP_ID }}
1616
PRIVATE_KEY: ${{ secrets.AUTO_PR_BOT_PRIVATE_KEY }}

0 commit comments

Comments
 (0)