Skip to content

Commit

Permalink
🔀 Merge branch main into python-interface
Browse files Browse the repository at this point in the history
  • Loading branch information
marcelwa committed Jan 29, 2025
2 parents e670dc3 + ddbc2fa commit 2659c07
Show file tree
Hide file tree
Showing 172 changed files with 12,470 additions and 3,203 deletions.
57 changes: 0 additions & 57 deletions .github/dependabot.yml

This file was deleted.

102 changes: 102 additions & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
{
$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",
],
"git-submodules": {
"enabled": true
},
"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/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jobs:

- name: Generate artifact attestation
if: github.event_name == 'release' && github.event.action == 'published'
uses: actions/attest-build-provenance@v1
uses: actions/attest-build-provenance@v2
with:
subject-name: docker.io/${{ secrets.DOCKER_USERNAME }}/fiction
subject-digest: ${{ steps.push.outputs.digest }}
Expand Down
27 changes: 9 additions & 18 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,28 +38,24 @@ jobs:
build_and_test:
strategy:
matrix:
os: [macos-13, macos-14]
compiler: [g++-12, g++-13, g++-14, clang++]
os: [macos-13, macos-14, macos-15]
compiler: [g++-13, g++-14, clang++]
include:
- os: macos-13
architecture: x64
- os: macos-14
architecture: arm64
- compiler: clang++
ccompiler: clang
- compiler: g++-12
ccompiler: gcc-12
- compiler: g++-13
ccompiler: gcc-13
- compiler: g++-14
ccompiler: gcc-14
exclude:
- os: macos-14
compiler: g++-12
- os: macos-14
compiler: g++-13
- os: macos-14
compiler: g++-14
- os: macos-15
compiler: g++-13
- os: macos-15
compiler: g++-14

name: 🍎 ${{matrix.os}} with ${{matrix.compiler}}
runs-on: ${{matrix.os}}
Expand All @@ -75,7 +71,8 @@ jobs:
with:
python-version: "3.13.x"

# Setup TBB for parallel STL algorithms via Homebrew
# etup TBB for parallel STL algorithms via Homebrew

- name: Setup TBB
run: brew install tbb

Expand All @@ -98,13 +95,8 @@ jobs:
uses: cda-tum/setup-z3@v1
with:
version: ${{env.Z3_VERSION}}
platform: macOS
architecture: ${{matrix.architecture}}
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

# Build and test pipeline for Debug mode

- name: Create Build Environment (Debug)
run: cmake -E make_directory ${{github.workspace}}/build_debug

Expand All @@ -131,10 +123,9 @@ jobs:

- name: Test (Debug)
working-directory: ${{github.workspace}}/build_debug
run: ctest -C Debug --verbose --output-on-failure --repeat until-pass:3 --parallel 4 --exclude-regex "quality"
run: ctest -C Debug --verbose --output-on-failure --repeat until-pass:3 --parallel 4

# Build and test pipeline for Release mode

- name: Create Build Environment (Release)
run: cmake -E make_directory ${{github.workspace}}/build_release

Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/pyfiction-pypi-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
fetch-depth: 0

- name: Install the latest version of uv
uses: astral-sh/setup-uv@v4
uses: astral-sh/setup-uv@v5
with:
version: "latest"
enable-cache: true
Expand All @@ -83,7 +83,8 @@ jobs:
strategy:
fail-fast: false
matrix:
runs-on: [ubuntu-latest, macos-13, macos-14, windows-latest]
runs-on:
[ubuntu-24.04, ubuntu-24.04-arm, macos-13, macos-14, windows-latest]

steps:
- uses: actions/checkout@v4
Expand All @@ -95,9 +96,10 @@ jobs:
uses: ilammy/msvc-dev-cmd@v1

- name: Setup ccache
if: matrix.runs-on != 'ubuntu-24.04-arm'
uses: hendrikmuhs/[email protected]
with:
key: "${{matrix.config.os}}-pyfiction"
key: "${{matrix.runs-on}}-pyfiction"
save: true
max-size: 10G

Expand All @@ -113,7 +115,7 @@ jobs:
uses: rui314/setup-mold@v1

- name: Install the latest version of uv
uses: astral-sh/setup-uv@v4
uses: astral-sh/setup-uv@v5
with:
version: "latest"
enable-cache: true
Expand All @@ -124,7 +126,7 @@ jobs:
- name: Upload wheel as an artifact
uses: actions/upload-artifact@v4
with:
name: cibw-wheels-${{ matrix.config.os }}-${{ matrix.config.arch }}-${{ matrix.python }}
name: cibw-wheels-${{ matrix.runs-on }}
path: ./wheelhouse/*.whl
overwrite: true

Expand All @@ -142,7 +144,7 @@ jobs:
merge-multiple: true

- name: Generate artifact attestation for sdist and wheel(s)
uses: actions/attest-build-provenance@v1
uses: actions/attest-build-provenance@v2
with:
subject-path: "dist/*"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-bindings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
strategy:
fail-fast: false
matrix:
runs-on: [ubuntu-latest, macos-13, macos-14, windows-latest]
runs-on: [ubuntu-latest, macos-13, macos-15, windows-latest]
steps:
- name: Clone Repository
uses: actions/checkout@v4
Expand All @@ -72,7 +72,7 @@ jobs:
version: ${{env.Z3_VERSION}}

- name: Install the latest version of uv
uses: astral-sh/setup-uv@v4
uses: astral-sh/setup-uv@v5
with:
version: "latest"
enable-cache: true
Expand Down
Loading

0 comments on commit 2659c07

Please sign in to comment.