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 .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Changes here will be overwritten by Copier
_commit: v0.4.0
_commit: v0.4.2
_src_path: https://github.com/deeplex/copier-cpp.git
email: henrik@gassmann.onl
full_name: Henrik Steffen Gaßmann
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@
"toolsToInstall": "copier,pipenv"
}
},
"postCreateCommand": "cd ${containerWorkspaceFolder}/docs && pipenv sync --dev",
"postCreateCommand": "cd '${containerWorkspaceFolder}' && mkdir -p build && ln -s -f x64-linux-clang/compile_commands.json ./build/compile_commands.json && cd ./docs && pipenv sync --dev",
}
12 changes: 6 additions & 6 deletions .github/workflows/cpp-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-24.04, windows-2022]
os: [ubuntu-24.04, windows-2025]
compiler: [gcc, clang, msvc]
exclude:
- os: ubuntu-24.04
compiler: msvc
- os: windows-2022
- os: windows-2025
compiler: gcc
include:
- os: macos-13
- os: macos-15-intel
compiler: gcc
triplet: x64-macos
- os: macos-15
Expand All @@ -40,7 +40,7 @@ jobs:
sudo add-apt-repository "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-19 main"
sudo apt-get -qq update
sudo apt-get -qq -y install clang-19
- os: windows-2022
- os: windows-2025
triplet: x64-windows

permissions:
Expand All @@ -50,7 +50,7 @@ jobs:
CTEST_OUTPUT_ON_FAILURE: "1"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v6

- name: Install required packages / compilers
if: ${{ matrix.install }}
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
actions: read

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v6

- name: "Install clang-tools-20"
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ on:

jobs:
build:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
name: Build docs
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v6

- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v6
with:
python-version: "3.11"
python-version: "3.12"
cache: 'pipenv'
cache-dependency-path: docs/Pipfile.lock

Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# http://creativecommons.org/publicdomain/zero/1.0/
#
########################################################################
cmake_minimum_required(VERSION 3.23...4.0)
cmake_minimum_required(VERSION 3.25)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/tools/cmake/")

########################################################################
Expand Down
10 changes: 5 additions & 5 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -189,18 +189,18 @@
}
},
{
"name": "x64-linux-gcc-12",
"name": "x64-linux-gcc-14",
"inherits": [
"x64-linux-gcc"
],
"cacheVariables": {
"VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/tools/toolchains/x64-linux-gcc-12.cmake"
"VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/tools/toolchains/x64-linux-gcc-14.cmake"
}
},
{
"name": "x64-linux-gcc-ci",
"inherits": [
"x64-linux-gcc-12"
"x64-linux-gcc-14"
]
},
{
Expand Down Expand Up @@ -233,8 +233,8 @@
],
"cacheVariables": {
"DPLX_DLOG_USE_SOURCE_LOCATION": false,
"VCPKG_TARGET_TRIPLET": "x64-osx-gcc-14",
"VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/tools/toolchains/x64-macos-gcc-14.cmake"
"VCPKG_TARGET_TRIPLET": "x64-macos-gcc-15",
"VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/tools/toolchains/x64-macos-gcc-15.cmake"
},
"vendor": {
"microsoft.com/VisualStudioSettings/CMake/1.0": {
Expand Down
5 changes: 5 additions & 0 deletions apps/deeplog-cli/deeplog.main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,11 @@ class LogDisplayComponent : public ftxui::ComponentBase
ctx.states, attribute_type_registry_state);
{
auto *attributeTypeRegistry = attributeTypeRegistryScope.get();
if (attributeTypeRegistry == nullptr)
{
// technically not possible, but GCC-15 doesn't realize that
return errc::not_enough_memory;
}
(void)attributeTypeRegistry->insert<attr::file>();
(void)attributeTypeRegistry->insert<attr::line>();
(void)attributeTypeRegistry->insert<attr::function>();
Expand Down
4 changes: 2 additions & 2 deletions docs/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ verify_ssl = true
name = "pypi"

[packages]
sphinx = "~=7.0"
sphinx = "~=8.2.3"
sphinx-copybutton = "~=0.5.2"
sphinx-multiversion = "~=0.2.4"
furo = "==2023.5.20"
furo = "==2025.9.25"

[dev-packages]
esbonio = "*"
Expand Down
Loading
Loading