Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ on:

jobs:
beman-submodule-check:
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-submodule-check.yml@1.2.1
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-submodule-check.yml@1.3.0

preset-test:
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-preset-test.yml@1.2.1
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-preset-test.yml@1.3.0
with:
matrix_config: >
[
Expand All @@ -29,7 +29,7 @@ jobs:
]

build-and-test:
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-build-and-test.yml@1.2.1
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-build-and-test.yml@1.3.0
with:
matrix_config: >
{
Expand Down Expand Up @@ -108,4 +108,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.2.1
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-create-issue-when-fault.yml@1.3.0
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ on:

jobs:
pre-commit:
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-pre-commit.yml@1.1.0
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-pre-commit.yml@1.3.0
15 changes: 15 additions & 0 deletions .github/workflows/pre-commit-update.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

name: Weekly pre-commit autoupdate

on:
workflow_dispatch:
schedule:
- cron: "0 16 * * 0"

jobs:
auto-update-pre-commit:
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-update-pre-commit.yml@1.3.0
secrets:
APP_ID: ${{ secrets.AUTO_PR_BOT_APP_ID }}
PRIVATE_KEY: ${{ secrets.AUTO_PR_BOT_PRIVATE_KEY }}
2 changes: 1 addition & 1 deletion infra/.beman_submodule
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[beman_submodule]
remote=https://github.com/bemanproject/infra.git
commit_hash=bb58b2a1cc894d58a55bf745be78f5d27029e245
commit_hash=322f31d5af0e4c17878ddaba9d3fa6bcca31a7df
32 changes: 0 additions & 32 deletions infra/.github/workflows/beman-submodule.yml

This file was deleted.

11 changes: 0 additions & 11 deletions infra/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,3 @@ repos:
- id: gersemi
name: CMake linting
exclude: ^.*/tests/.*/data/ # Exclude test data directories

# Python linting and formatting
# config file: ruff.toml (not currently present but add if needed)
# https://docs.astral.sh/ruff/configuration/
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.13.2
hooks:
- id: ruff-check
files: ^tools/beman-tidy/
- id: ruff-format
files: ^tools/beman-tidy/
7 changes: 0 additions & 7 deletions infra/.pre-commit-hooks.yaml

This file was deleted.

3 changes: 1 addition & 2 deletions infra/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@ so it does not respect the usual structure of a Beman library repository nor The

* `cmake/`: CMake modules and toolchain files used by Beman libraries.
* `containers/`: Containers used for CI builds and tests in the Beman org.
* `tools/`: Tools used to manage the infrastructure and the codebase (e.g., linting, formatting, etc.).

## Usage

This repository is intended to be used as a beman-submodule in other Beman repositories. See
[the Beman Submodule documentation](./tools/beman-submodule/README.md) for details.
[the beman-submodule documentation](https://github.com/bemanproject/beman-submodule) for details.


### CMake Modules
Expand Down
6 changes: 3 additions & 3 deletions infra/cmake/beman-install-library-config.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ function(beman_install_library name)

option(
${project_prefix}_INSTALL_CONFIG_FILE_PACKAGE
"Enable building examples. Default: ${PROJECT_IS_TOP_LEVEL}. Values: { ON, OFF }."
${PROJECT_IS_TOP_LEVEL}
"Enable creating and installing a CMake config-file package. Default: ON. Values: { ON, OFF }."
ON
)

# By default, install the config package
Expand Down Expand Up @@ -121,7 +121,7 @@ function(beman_install_library name)
find_file(
config_file_template
NAMES "${package_name}-config.cmake.in"
PATHS "${CMAKE_CURRENT_SOURCE_DIR}"
PATHS "${PROJECT_SOURCE_DIR}/cmake"
NO_DEFAULT_PATH
NO_CACHE
REQUIRED
Expand Down
63 changes: 0 additions & 63 deletions infra/tools/beman-submodule/README.md

This file was deleted.

Loading