Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update dependency https://github.com/serious-scaffold/ss-pybind11 to v0.8.18 #107

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
5 changes: 2 additions & 3 deletions .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
_commit: v0.8.13
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
_commit: v0.8.18
_src_path: https://github.com/serious-scaffold/ss-pybind11
author_email: [email protected]
author_name: l.feng
Expand All @@ -22,5 +23,3 @@ repo_namespace: msclock
repo_platform: github
use_codecov: true
use_codeql: true
use_conan: false
use_cpm: false
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// https://github.com/devcontainers/images/tree/main/src/base-ubuntu
{
"name": "cppcheck-wheel",
"image": "mcr.microsoft.com/devcontainers/base:ubuntu-22.04",
"image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
"capAdd": [
// Enable ptrace-based debugging for C++
"SYS_PTRACE"
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,6 @@ jobs:
python-version: ['3.8', '3.12']
runs-on: [ubuntu-24.04, macos-14, windows-2022] # renovate: github-runner

include:
- python-version: pypy-3.10
runs-on: ubuntu-24.04 # renovate: github-runner

name: Check Python ${{ matrix.python-version }} on ${{ matrix.runs-on }}

steps:
Expand All @@ -69,6 +65,7 @@ jobs:
~/vcpkg
~/.cache/pip
~/.cache/vcpkg
~/AppData/Local/vcpkg
key: ${{ matrix.python-version }}-${{ matrix.runs-on }}-${{ hashFiles('vcpkg.json') }}
restore-keys: ${{ matrix.python-version }}-${{ matrix.runs-on }}-${{ hashFiles('vcpkg.json') }}

Expand Down
6 changes: 6 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,12 @@ repos:
hooks:
- id: shellcheck

# Check for markdown
- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.41.0
hooks:
- id: markdownlint-fix

# Check for renovate config
- repo: https://github.com/renovatebot/pre-commit-hooks
rev: 39.49.3
Expand Down
53 changes: 53 additions & 0 deletions cmake/presets/base.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,21 @@
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_VERBOSE_MAKEFILE": "FALSE"
}
},
{
"name": "base-config",
"hidden": true,
"inherits": [
"ninja-config",
"vcpkg"
],
"binaryDir": "${sourceDir}/out/build/${presetName}",
"installDir": "${sourceDir}/out/install/${presetName}",
"cacheVariables": {
"CMAKE_EXPORT_COMPILE_COMMANDS": true,
"CMAKE_COMPILE_WARNING_AS_ERROR": false,
"CMAKE_VERBOSE_MAKEFILE": "FALSE"
}
}
],
"buildPresets": [
Expand All @@ -28,6 +43,18 @@
"hidden": true,
"inherits": "ninja",
"configurePreset": "base"
},
{
"name": "base-config-relwithdebinfo",
"hidden": true,
"inherits": "ninja-config-relwithdebinfo",
"configurePreset": "base-config"
},
{
"name": "base-config-debug",
"hidden": true,
"inherits": "ninja-config-debug",
"configurePreset": "base-config"
}
],
"testPresets": [
Expand All @@ -43,6 +70,32 @@
"noTestsAction": "error",
"stopOnFailure": true
}
},
{
"name": "base-config-relwithdebinfo",
"hidden": true,
"inherits": "ninja-config-relwithdebinfo",
"configurePreset": "base-config",
"output": {
"outputOnFailure": true
},
"execution": {
"noTestsAction": "error",
"stopOnFailure": true
}
},
{
"name": "base-config-debug",
"hidden": true,
"inherits": "ninja-config-debug",
"configurePreset": "base-config",
"output": {
"outputOnFailure": true
},
"execution": {
"noTestsAction": "error",
"stopOnFailure": true
}
}
]
}
43 changes: 25 additions & 18 deletions cmake/presets/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,39 +9,46 @@
"inherits": [
"base"
]
},
{
"name": "default-config",
"inherits": [
"base-config"
]
}
],
"buildPresets": [
{
"name": "default",
"inherits": "base",
"configurePreset": "default"
},
{
"name": "default-config-relwithdebinfo",
"inherits": "base-config-relwithdebinfo",
"configurePreset": "default-config"
},
{
"name": "default-config-debug",
"inherits": "base-config-debug",
"configurePreset": "default-config"
}
],
"testPresets": [
{
"name": "default",
"inherits": "base",
"configurePreset": "default"
}
],
"workflowPresets": [
},
{
"name": "default",
"steps": [
{
"type": "configure",
"name": "default"
},
{
"type": "build",
"name": "default"
},
{
"type": "test",
"name": "default"
}
]
"name": "default-config-relwithdebinfo",
"inherits": "base-config-relwithdebinfo",
"configurePreset": "default-config"
},
{
"name": "default-config-debug",
"inherits": "base-config-debug",
"configurePreset": "default-config"
}
]
}
22 changes: 17 additions & 5 deletions cmake/presets/generators/ninja.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"generator": "Ninja"
},
{
"name": "ninja-multi-config",
"name": "ninja-config",
"hidden": true,
"generator": "Ninja Multi-Config"
}
Expand All @@ -19,10 +19,16 @@
"configurePreset": "ninja"
},
{
"name": "ninja-multi-config",
"name": "ninja-config-relwithdebinfo",
"hidden": true,
"configurePreset": "ninja-multi-config",
"configurePreset": "ninja-config",
"configuration": "RelWithDebInfo"
},
{
"name": "ninja-config-debug",
"hidden": true,
"configurePreset": "ninja-config",
"configuration": "Debug"
}
],
"testPresets": [
Expand All @@ -32,10 +38,16 @@
"configurePreset": "ninja"
},
{
"name": "ninja-multi-config",
"name": "ninja-config-relwithdebinfo",
"hidden": true,
"configurePreset": "ninja-multi-config",
"configurePreset": "ninja-config",
"configuration": "RelWithDebInfo"
},
{
"name": "ninja-config-debug",
"hidden": true,
"configurePreset": "ninja-config",
"configuration": "Debug"
}
]
}
19 changes: 0 additions & 19 deletions cmake/presets/x64-linux-gcc.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,5 @@
"inherits": "base",
"configurePreset": "x64-linux-gcc"
}
],
"workflowPresets": [
{
"name": "x64-linux-gcc",
"steps": [
{
"type": "configure",
"name": "x64-linux-gcc"
},
{
"type": "build",
"name": "x64-linux-gcc"
},
{
"type": "test",
"name": "x64-linux-gcc"
}
]
}
]
}
19 changes: 0 additions & 19 deletions cmake/presets/x64-linux-llvm.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,5 @@
"inherits": "base",
"configurePreset": "x64-linux-llvm"
}
],
"workflowPresets": [
{
"name": "x64-linux-llvm",
"steps": [
{
"type": "configure",
"name": "x64-linux-llvm"
},
{
"type": "build",
"name": "x64-linux-llvm"
},
{
"type": "test",
"name": "x64-linux-llvm"
}
]
}
]
}
19 changes: 0 additions & 19 deletions cmake/presets/x64-mingw-dynamic-windows-mingw.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,24 +31,5 @@
"inherits": "base",
"configurePreset": "x64-mingw-dynamic-windows-mingw"
}
],
"workflowPresets": [
{
"name": "x64-mingw-dynamic-windows-mingw",
"steps": [
{
"type": "configure",
"name": "x64-mingw-dynamic-windows-mingw"
},
{
"type": "build",
"name": "x64-mingw-dynamic-windows-mingw"
},
{
"type": "test",
"name": "x64-mingw-dynamic-windows-mingw"
}
]
}
]
}
19 changes: 0 additions & 19 deletions cmake/presets/x64-mingw-static-windows-mingw.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,5 @@
"inherits": "base",
"configurePreset": "x64-mingw-static-windows-mingw"
}
],
"workflowPresets": [
{
"name": "x64-mingw-static-windows-mingw",
"steps": [
{
"type": "configure",
"name": "x64-mingw-static-windows-mingw"
},
{
"type": "build",
"name": "x64-mingw-static-windows-mingw"
},
{
"type": "test",
"name": "x64-mingw-static-windows-mingw"
}
]
}
]
}
27 changes: 27 additions & 0 deletions cmake/vcpkg/bootstrap/vcpkg_configure.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,30 @@ macro(detect_vcpkg)
endif()
endmacro()

# Add VCPKG_INSTALL_REPORT_FAILURE option to report vcpkg failure in detail
function(_vcpkg_install_report_failure)
if(DEFINED ENV{CI} AND NOT "$ENV{CI}" STREQUAL "")
set(VCPKG_INSTALL_REPORT_FAILURE
ON
CACHE INTERNAL "Enable vcpkg install failure report in detail")
endif()
file(READ "$CACHE{_VCPKG_TOOLCHAIN_FILE}" _vcpkg_toolchain_content)
if(VCPKG_INSTALL_REPORT_FAILURE
AND NOT "${_vcpkg_toolchain_content}" MATCHES
[[VCPKG INSTALL REPORT FAILURE IN DETAIL]])
string(
REPLACE
[[message(STATUS "Running vcpkg install - failed")]]
[[message(STATUS "Running vcpkg install - failed")
file(READ "${CMAKE_CURRENT_BINARY_DIR}/vcpkg_installed/vcpkg/issue_body.md" issue_body_content)
message(STATUS "")
set(Z_NATIVE_VCPKG_MANIFEST_INSTALL_LOGFILE "${Z_NATIVE_VCPKG_MANIFEST_INSTALL_LOGFILE}\nVCPKG INSTALL REPORT FAILURE IN DETAIL: ${CMAKE_CURRENT_BINARY_DIR}/vcpkg_installed/vcpkg/issue_body.md\n${issue_body_content}\n")]]
_vcpkg_toolchain_content
"${_vcpkg_toolchain_content}")
file(WRITE "$CACHE{_VCPKG_TOOLCHAIN_FILE}" "${_vcpkg_toolchain_content}")
endif()
endfunction()

# bootstrap and configure vcpkg
macro(vcpkg_configure)
detect_vcpkg()
Expand All @@ -68,6 +92,9 @@ macro(vcpkg_configure)
endif()

_vcpkg_chainload_toolchain()

_vcpkg_install_report_failure()

message(STATUS "vcpkg_toolchain_file:$CACHE{_VCPKG_TOOLCHAIN_FILE}")
include("$CACHE{_VCPKG_TOOLCHAIN_FILE}")
endmacro()
3 changes: 1 addition & 2 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,8 @@ def tests(session: nox.Session) -> None:
@nox.session(reuse_venv=True)
def docs(session: nox.Session) -> None:
"""
Build the docs. Pass "--serve" to serve. Pass "-b linkcheck" to check links.
Build the docs. Pass "-- --help" to show helps.
"""

parser = argparse.ArgumentParser()
parser.add_argument("--serve", action="store_true", help="Serve after building")
parser.add_argument(
Expand Down
Loading