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
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ add_subdirectory(src/beman/task)

#===============================================================================
# NOTE: this must be done before tests! CK
include(./cmake/beman-install-library.cmake)
include(infra/cmake/beman-install-library.cmake)
beman_install_library(${PROJECT_NAME} TARGETS ${PROJECT_NAME} beman.task_headers
DEPENDENCIES [===[beman.execution 0.2.0 EXACT]===]
)
Expand Down
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=63cb577f6484f13ce3349de49ad5ce27e20bf1da
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
2 changes: 1 addition & 1 deletion cmake/Config.cmake.in → infra/cmake/Config.cmake.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# cmake/Config.cmake.in -*-cmake-*-
# cmake/Config.cmake.in -*-makefile-*-
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

include(CMakeFindDependencyMacro)
Expand Down
169 changes: 0 additions & 169 deletions infra/cmake/beman-install-library-config.cmake

This file was deleted.

Loading
Loading