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
1 change: 1 addition & 0 deletions .beman-tidy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@

disabled_rules: []
ignored_paths:
- .cache/
- infra/
8 changes: 4 additions & 4 deletions .github/workflows/ci_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ concurrency:

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

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

build-and-test:
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-build-and-test.yml@1.7.3
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-build-and-test.yml@1.7.4
with:
matrix_config: >
{
Expand Down Expand Up @@ -132,4 +132,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.3
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-create-issue-when-fault.yml@1.7.4
8 changes: 7 additions & 1 deletion .github/workflows/pre-commit-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ on:
branches:
- main

permissions:
contents: read
checks: write
issues: write
pull-requests: write

jobs:
pre-commit:
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-pre-commit.yml@1.3.0
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-pre-commit.yml@1.7.4
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
auto-update-pre-commit:
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-update-pre-commit.yml@1.7.3
uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-update-pre-commit.yml@1.7.4
secrets:
APP_ID: ${{ secrets.AUTO_PR_BOT_APP_ID }}
PRIVATE_KEY: ${{ secrets.AUTO_PR_BOT_PRIVATE_KEY }}
2 changes: 1 addition & 1 deletion CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"BEMAN_BUILDSYS_SANITIZER": "MaxSan"
"BEMAN_BUILDSYS_SANITIZER": ""
}
},
{
Expand Down
19 changes: 14 additions & 5 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,17 @@ MAKEFLAGS+= --warn-undefined-variables # Warn when an undefined variable is ref
.SUFFIXES: # Disable all suffix rules.
##################################################

PRESET ?= release
IMAGE ?= linux-clang:23
ifeq ($(origin CXX),default)
CXX:= clang++-23
CC:= clang-23
endif

PRESET?=release
IMAGE?=ghcr.io/bemanproject/infra-containers-clang:latest

_build_path:=build/$(PRESET)

.PHONY: all check distclean dockerbuild
.PHONY: all check distclean format dockerbuild

# default target rule
all: .init compile_commands.json ## Make all with cmake workflow preset
Expand All @@ -27,8 +32,8 @@ check: .init compile_commands.json ## Run clang-tidy on examples

.PHONY: compile_commands.json
compile_commands.json: $(_build_path)/compile_commands.json
if [ "$(shell readlink compile_commands.json)" != "$(_build_path)/compile_commands.json" ] ; then \
ln -fs $< $@
if [ "X$(shell readlink compile_commands.json)" != "X$(_build_path)/compile_commands.json" ] ; then \
ln -fs $< $@; \
fi

CMakeUserPresets.json:: cmake/CMakeUserPresets.json
Expand All @@ -41,6 +46,10 @@ distclean: ## Remove all build artifacts
.init
find . -name '*~' -delete

format: distclean ## Format all files with pre-commit
-pre-commit autoupdate
pre-commit run --all

dockerbuild: ## Start docker image interactive
docker run -it -v $(CURDIR):/home/builder/workdir $(IMAGE)

Expand Down
2 changes: 1 addition & 1 deletion cmake/cxx-modules-rules.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ if(NOT DEFINED CMAKE_CXX_STANDARD)
endif()

# Neither of these two are technically needed, but they make the expectation clear
set(CMAKE_CXX_EXTENSIONS ON)
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

# NOTE: only with Ninja generator install of bmi files works yet!
Expand Down
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# =============================================================================
# PYTHON PACKAGES (PIP)
# =============================================================================
# USE (python3): pip3 install -U -r requirements.txt
# USE (python3): uv pip install -r requirements.txt
# =============================================================================

### python tools
Expand All @@ -18,11 +18,11 @@ check-jsonschema>=0.36.1
cmake>=4.3
codespell>=2.4.3
# conan>=2.26.2
gersemi>=0.27.2
gersemi>=0.28.0
gcovr>=8.6
ninja>=1.13
yamllint>=1.38

beman_submodule
beman-local-ci
beman-submodule
#TODO: beman-local-ci>0.3.2
beman-tidy
Loading