Skip to content

Commit

Permalink
Merge branch 'main' into abc-callback
Browse files Browse the repository at this point in the history
Signed-off-by: Marcel Walter <marcel.walter@tum.de>
  • Loading branch information
marcelwa authored Dec 12, 2024
2 parents 8513343 + a363f8a commit 921757b
Show file tree
Hide file tree
Showing 104 changed files with 2,174 additions and 1,636 deletions.
4 changes: 1 addition & 3 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ IncludeCategories:
Priority: 4
- Regex: '<z3[a-zA-Z0-9_\+]+.+>$'
Priority: 5
- Regex: '<[a-zA-Z0-9_]+>$'
- Regex: "<[a-zA-Z0-9_]+>$"
Priority: 6
IndentCaseLabels: true
IndentWidth: 4
Expand All @@ -85,5 +85,3 @@ SpacesInSquareBrackets: false
Standard: c++17
UseTab: Never
LineEnding: LF

...
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 🐛 Bug report
description: Something is not working correctly.
title: "🐛 <title>"
labels: [ "bug" ]
labels: ["bug"]
assignees:
- marcelwa
body:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature-request.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: ✨ Feature request
description: Suggest an idea
title: "✨ <title>"
labels: [ "enhancement" ]
labels: ["enhancement"]
assignees:
- marcelwa
body:
Expand Down
57 changes: 0 additions & 57 deletions .github/dependabot.yml

This file was deleted.

99 changes: 99 additions & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
{
$schema: "https://docs.renovatebot.com/renovate-schema.json",
extends: [
"config:recommended",
":gitSignOff"
],
prHourlyLimit: 10,
enabledManagers: [
"git-submodules",
"github-actions",
"pre-commit",
"pep621",
"pip_requirements",
"dockerfile",
],
"pre-commit": {
enabled: true
},
lockFileMaintenance: {
"enabled": true
// "automerge": true, disabled due to endless update loops caused by setuptools_scm
},
configMigration: true,
schedule: [
"every weekend"
],
packageRules: [
{
matchManagers: [
"git-submodules"
],
addLabels: [
"dependencies",
"submodules"
],
commitMessagePrefix: "⬆\uFE0F\uD83D\uDC68\u200D\uD83D\uDCBB",
"groupName": "Submodules",
},
{
matchManagers: [
"github-actions"
],
addLabels: [
"github_actions"
],
commitMessagePrefix: "⬆\uFE0F\uD83D\uDC68\u200D\uD83D\uDCBB",
"groupName": "GitHub Actions",
},
{
matchManagers: [
"pre-commit"
],
addLabels: [
"pre-commit"
],
commitMessagePrefix: "⬆\uFE0F\uD83E\uDE9D",
"groupName": "Pre-Commit Hooks",
},
{
matchManagers: [
"pep621"
],
addLabels: [
"dependencies",
"python"
],
commitMessagePrefix: "⬆\uFE0F\uD83D\uDC0D",
"groupName": "Python Dependencies",
},
{
matchManagers: [
"pip_requirements"
],
addLabels: [
"dependencies",
"python"
],
commitMessagePrefix: "⬆\uFE0F\uD83D\uDC0D",
"groupName": "Python Dependencies",
},
{
matchManagers: [
"dockerfile"
],
addLabels: [
"docker"
],
commitMessagePrefix: "⬆\uD83D\uDC0B",
"groupName": "Dockerfile",
},
{
"description": "Automerge patch updates",
"matchUpdateTypes": [
"patch"
],
"automerge": true
}
]
}
2 changes: 1 addition & 1 deletion .github/workflows/clang-tidy-review-post.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 🚨 • Post Clang-Tidy Review

on:
workflow_run:
workflows: [ 'Clang-Tidy Review' ]
workflows: ["Clang-Tidy Review"]
types:
- completed

Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/clang-tidy-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: Clang-Tidy Review
on:
pull_request:
paths:
- '**/*.hpp'
- '**/*.cpp'
- 'libs/**'
- '.github/workflows/clang-tidy-review.yml'
- '!bindings/mnt/pyfiction/include/pyfiction/pybind11_mkdoc_docstrings.hpp'
- "**/*.hpp"
- "**/*.cpp"
- "libs/**"
- ".github/workflows/clang-tidy-review.yml"
- "!bindings/mnt/pyfiction/include/pyfiction/pybind11_mkdoc_docstrings.hpp"

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
Expand Down Expand Up @@ -37,16 +37,16 @@ jobs:
-DFICTION_EXPERIMENTS=ON
-DMOCKTURTLE_EXAMPLES=OFF
build_dir: build
apt_packages: 'libreadline-dev,libtbb-dev'
config_file: '.clang-tidy'
exclude: 'libs/*,docs/*,benchmarks/*,bib/*,*/pyfiction/pybind11_mkdoc_docstrings.hpp,*/pyfiction/documentation.hpp'
apt_packages: "libreadline-dev,libtbb-dev"
config_file: ".clang-tidy"
exclude: "libs/*,docs/*,benchmarks/*,bib/*,*/pyfiction/pybind11_mkdoc_docstrings.hpp,*/pyfiction/documentation.hpp"
split_workflow: true

- name: Make sure that the review file exists
id: check-review-output
uses: andstor/file-existence-action@v3.0.0
with:
files: 'clang-tidy-review-output.json'
files: "clang-tidy-review-output.json"
ignore_case: true

- name: Upload review artifact
Expand Down
50 changes: 25 additions & 25 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,30 @@ name: 📝 • CodeQL

on:
push:
branches: [ 'main' ]
branches: ["main"]
paths:
- '**/*.hpp'
- '**/*.cpp'
- '**/*.cmake'
- '**/CMakeLists.txt'
- '**/*.py'
- 'libs/**'
- '.github/workflows/codeql-analysis.yml'
- '!bindings/mnt/pyfiction/include/pyfiction/pybind11_mkdoc_docstrings.hpp'
- "**/*.hpp"
- "**/*.cpp"
- "**/*.cmake"
- "**/CMakeLists.txt"
- "**/*.py"
- "libs/**"
- ".github/workflows/codeql-analysis.yml"
- "!bindings/mnt/pyfiction/include/pyfiction/pybind11_mkdoc_docstrings.hpp"
pull_request:
branches: [ 'main' ]
branches: ["main"]
paths:
- '**/*.hpp'
- '**/*.cpp'
- '**/*.cmake'
- '**/CMakeLists.txt'
- '**/*.py'
- 'libs/**'
- '.github/workflows/codeql-analysis.yml'
- '!bindings/mnt/pyfiction/include/pyfiction/pybind11_mkdoc_docstrings.hpp'
- "**/*.hpp"
- "**/*.cpp"
- "**/*.cmake"
- "**/CMakeLists.txt"
- "**/*.py"
- "libs/**"
- ".github/workflows/codeql-analysis.yml"
- "!bindings/mnt/pyfiction/include/pyfiction/pybind11_mkdoc_docstrings.hpp"
merge_group:
schedule:
- cron: '30 5 * * 6'
- cron: "30 5 * * 6"

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
Expand All @@ -46,9 +46,9 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ 'cpp', 'python' ]
compiler: [ clang++-17 ]
build_type: [ Debug ]
language: ["cpp", "python"]
compiler: [clang++-17]
build_type: [Debug]

steps:
- name: Free Disk Space (Ubuntu)
Expand All @@ -74,16 +74,16 @@ jobs:
- name: Setup ccache
uses: hendrikmuhs/ccache-action@v1.2
with:
key: '${{matrix.os}}-${{matrix.compiler}}'
key: "${{matrix.os}}-${{matrix.compiler}}"
variant: ccache
save: true
max-size: 10G

- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: '3.13.x'
cache: 'pip'
python-version: "3.13.x"
cache: "pip"

- name: Setup mold
uses: rui314/setup-mold@v1
Expand Down
42 changes: 21 additions & 21 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@ name: ☂️ • Coverage

on:
push:
branches: [ 'main' ]
branches: ["main"]
paths:
- '**/*.hpp'
- '**/*.cpp'
- '**/*.cmake'
- '**/CMakeLists.txt'
- 'libs/**'
- '.github/workflows/coverage.yml'
- '!bindings/mnt/pyfiction/include/pyfiction/pybind11_mkdoc_docstrings.hpp'
- "**/*.hpp"
- "**/*.cpp"
- "**/*.cmake"
- "**/CMakeLists.txt"
- "libs/**"
- ".github/workflows/coverage.yml"
- "!bindings/mnt/pyfiction/include/pyfiction/pybind11_mkdoc_docstrings.hpp"
pull_request:
branches: [ 'main' ]
branches: ["main"]
paths:
- '**/*.hpp'
- '**/*.cpp'
- '**/*.cmake'
- '**/CMakeLists.txt'
- 'libs/**'
- '.github/workflows/coverage.yml'
- '!bindings/mnt/pyfiction/include/pyfiction/pybind11_mkdoc_docstrings.hpp'
- "**/*.hpp"
- "**/*.cpp"
- "**/*.cmake"
- "**/CMakeLists.txt"
- "libs/**"
- ".github/workflows/coverage.yml"
- "!bindings/mnt/pyfiction/include/pyfiction/pybind11_mkdoc_docstrings.hpp"
merge_group:

concurrency:
Expand All @@ -39,8 +39,8 @@ jobs:
build_and_test:
strategy:
matrix:
os: [ ubuntu-22.04 ]
compiler: [ g++-11 ]
os: [ubuntu-22.04]
compiler: [g++-11]

name: Coverage on ${{matrix.os}} with ${{matrix.compiler}}
runs-on: ${{matrix.os}}
Expand All @@ -57,16 +57,16 @@ jobs:
- name: Setup ccache
uses: hendrikmuhs/ccache-action@v1.2
with:
key: '${{matrix.os}}-${{matrix.compiler}}'
key: "${{matrix.os}}-${{matrix.compiler}}"
variant: ccache
save: true
max-size: 10G

- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: '3.13.x'
cache: 'pip'
python-version: "3.13.x"
cache: "pip"

- name: Setup mold
uses: rui314/setup-mold@v1
Expand Down
Loading

0 comments on commit 921757b

Please sign in to comment.