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

msclock-bot[bot] · msclock · web-flow · commit ce4717b85aad · 2024-12-17T14:26:28.000+08:00
* chore(deps): update dependency https://github.com/serious-scaffold/ss-pybind11 to v0.8.24 * Resolve conflicts Signed-off-by: l.feng <43399351+msclock@users.noreply.github.com> * Constraint to 3.9 Signed-off-by: l.feng <43399351+msclock@users.noreply.github.com> --------- Signed-off-by: l.feng <43399351+msclock@users.noreply.github.com> Co-authored-by: msclock-bot[bot] <163820484+msclock-bot[bot]@users.noreply.github.com> Co-authored-by: l.feng <43399351+msclock@users.noreply.github.com>
diff --git a/.copier-answers.yml b/.copier-answers.yml
@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: v0.8.20
+_commit: v0.8.24
 _src_path: https://github.com/serious-scaffold/ss-pybind11
 author_email: msclock@126.com
 author_name: l.feng
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -2,6 +2,8 @@ name: CD
 
 on:
   workflow_dispatch:
+  schedule:
+    - cron: 0 0 * * 5
   release:
     types:
       - published
@@ -30,63 +32,34 @@ jobs:
           name: cibw-sdist
           path: dist/*.tar.gz
 
+
   build_wheels:
-    name: Build ${{ matrix.build }}-${{ matrix.arch }} wheels on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
+    uses: ./.github/workflows/reuseable_cibuildwheel.yml
+    secrets: inherit
+    with:
+      auto: true
+      extra: true
 
-    strategy:
-      matrix:
-        arch: [aarch64, ppc64le, s390x, armv7l, x86_64, i686]
-        build: [manylinux, musllinux]
-        os: [ubuntu-24.04] # renovate: github-runner
-        use_qemu: [aarch64 ppc64le s390x armv7l]
-        include:
-          - os: windows-2019
-            arch: AMD64
-            build: win
-          - os: windows-2019
-            arch: x86
-            build: win
-          - os: windows-2022
-            arch: ARM64
-            build: win
-          - os: macos-13
-            arch: x86_64
-            build: macos
-          - os: macos-latest
-            arch: arm64
-            build: macos
 
+  check_dist:
+    name: Check dist
+    needs: [build_wheels, build_sdist]
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-        with:
-          fetch-depth: 0
-
-      - name: Set up msvc on Windows
-        if: runner.os == 'Windows'
-        uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1
+      - uses: actions/download-artifact@v4
         with:
-          arch: ${{ matrix.arch }}
+          pattern: cibw-*
+          path: dist
+          merge-multiple: true
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
-        if: runner.os == 'Linux' && contains(matrix.use_qemu, matrix.arch)
+      - run: pipx run twine check --strict dist/*
 
-      - name: Build wheels
-        uses: pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969 # v2.22.0
-        env:
-          CIBW_ARCHS: ${{ matrix.arch }}
-          CIBW_BUILD: cp311-${{ matrix.build }}*
-
-      - name: Upload wheels
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
-        with:
-          name: cibw-${{ runner.os }}-${{ matrix.build }}-${{ matrix.arch }}
-          path: wheelhouse/*.whl
 
   upload_all:
-    needs: [build_wheels, build_sdist]
-    environment: pypi
+    needs: [build_wheels, build_sdist, check_dist]
+    environment:
+      name: pypi
+      url: https://pypi.org/project/cppcheck-wheel
     permissions:
       id-token: write
     runs-on: ubuntu-24.04
@@ -101,6 +74,6 @@ jobs:
 
       - uses: pypa/gh-action-pypi-publish@release/v1
         env:
-          PYPI_API_TOKEN: ${{ secrets.PYPI_API_TOKEN  }}
+          PYPI_API_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
         with:
           password: ${{ secrets.PYPI_API_TOKEN }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,17 +41,18 @@ jobs:
           pipx run nox -s pylint
 
 
-
-  checks:
-    runs-on: ${{ matrix.runs-on }}
+  wheels:
     needs: [pre-commit]
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ['3.8', '3.12']
-        runs-on: [ubuntu-24.04, macos-14, windows-2022] # renovate: github-runner
+    uses: ./.github/workflows/reuseable_cibuildwheel.yml
+    secrets: inherit
+    with:
+      auto: true
+      extra: false
 
-    name: Check Python ${{ matrix.python-version }} on ${{ matrix.runs-on }}
+
+  codecov:
+    runs-on: ubuntu-24.04
+    needs: [pre-commit]
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -65,13 +66,12 @@ 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') }}
+          key: codecov-${{ hashFiles('vcpkg.json') }}
+          restore-keys: codecov-${{ hashFiles('vcpkg.json') }}
 
       - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: 3.x
 
       - name: Install package
         run: python -m pip install .[test] -v
@@ -88,7 +88,6 @@ jobs:
   check-docs:
     runs-on: ubuntu-24.04
     needs: [pre-commit]
-    timeout-minutes: 15
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -119,7 +118,8 @@ jobs:
   pass:
     if: always()
     needs:
-      - checks
+      - wheels
+      - codecov
       - check-docs
     runs-on: ubuntu-24.04
     timeout-minutes: 2
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -31,7 +31,6 @@ jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-24.04
-    timeout-minutes: 15
     permissions:
       actions: read
       contents: read
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
@@ -28,7 +28,6 @@ jobs:
     permissions:
       contents: write
       id-token: write
-    timeout-minutes: 15
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
diff --git a/.github/workflows/reuseable_cibuildwheel.yml b/.github/workflows/reuseable_cibuildwheel.yml
@@ -0,0 +1,67 @@
+name: cibuildwheel
+
+on:
+  workflow_call:
+    inputs:
+      auto:
+        description: Build wheels for auto archs
+        required: true
+        type: boolean
+      extra:
+        description: Build wheels for aarch64 armv7l ppc64le & s390x
+        required: true
+        type: boolean
+
+jobs:
+  build_wheels:
+    name: On ${{ matrix.os }}, with ${{ matrix.arch }}, build ${{ matrix.build }} wheels
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-24.04] # renovate: github-runner
+        arch: [aarch64, ppc64le, s390x, armv7l, x86_64, i686]
+        build: [manylinux, musllinux]
+        qemu_arch: [aarch64 ppc64le s390x armv7l]
+        include:
+          - {os: windows-2019, arch: AMD64, build: win}
+          - {os: windows-2019, arch: x86, build: win}
+          - {os: windows-2022, arch: ARM64, build: win}
+          - {os: macos-13, arch: x86_64, build: macos}
+          - {os: macos-14, arch: arm64, build: macos}
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        if: >
+          inputs.auto && !contains(matrix.qemu_arch, matrix.arch) ||
+          inputs.extra && contains(matrix.qemu_arch, matrix.arch)
+        with:
+          fetch-depth: 0
+
+      - name: Set up msvc on Windows
+        if: runner.os == 'Windows' && inputs.auto && !contains(matrix.qemu_arch, matrix.arch)
+        uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1
+        with:
+          arch: ${{ matrix.arch }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
+        if: runner.os == 'Linux' && inputs.extra && contains(matrix.qemu_arch, matrix.arch)
+
+      - name: Build wheels
+        if: >
+          inputs.auto && !contains(matrix.qemu_arch, matrix.arch) ||
+          inputs.extra && contains(matrix.qemu_arch, matrix.arch)
+        uses: pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969 # v2.22.0
+        env:
+          CIBW_ARCHS: ${{ matrix.arch }}
+          CIBW_BUILD: cp39-${{ matrix.build }}*
+
+      - name: Upload wheels
+        if: >
+          inputs.auto && !contains(matrix.qemu_arch, matrix.arch) ||
+          inputs.extra && contains(matrix.qemu_arch, matrix.arch)
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
+        with:
+          name: cibw-${{ matrix.os }}-${{ matrix.build }}-${{ matrix.arch }}
+          path: wheelhouse/*.whl
diff --git a/.renovaterc.json b/.renovaterc.json
@@ -61,8 +61,7 @@
       "datasourceTemplate": "pypi",
       "fileMatch": [
         "^\\.github/workflows/.+\\.yml$",
-        "^\\.renovaterc\\.json$",
-        "^Makefile$"
+        "^\\.renovaterc\\.json$"
       ],
       "matchStrings": [
         "pipx? install.* (?<depName>.*?)==(?<currentValue>.*?)[\\s\";]"
@@ -74,8 +73,7 @@
       "depTypeTemplate": "github-runner",
       "description": "Match GitHub runner defined in GitHub Actions matrix strategy",
       "fileMatch": [
-        "^\\.github/workflows/.+\\.yml$",
-        "^template/.*\\.github.*/workflows/.+\\.yml(\\.jinja)?$"
+        "^\\.github/workflows/.+\\.yml$"
       ],
       "matchStringsStrategy": "recursive",
       "matchStrings": [
diff --git a/pyproject.toml b/pyproject.toml
@@ -64,7 +64,9 @@ metadata.version.provider = "scikit_build_core.metadata.setuptools_scm"
 sdist.include = ["src/cppcheck/_version.py"]
 cmake.args = [
   "-DBUILD_TESTING=OFF",
-  "-DCMAKE_BUILD_TYPE=ReWithDebInfo",
+  "-DCMAKE_BUILD_TYPE=Release",
+  "-DVCPKG_INSTALL_REPORT_FAILURE=ON",
+  "-DVCPKG_INSTALL_OPTIONS=--allow-unsupported",
   "-DCMAKE_TOOLCHAIN_FILE=cmake/vcpkg/vcpkg.toolchain.cmake",
   "-DVCPKG_OVERLAY_TRIPLETS=cmake/vcpkg/triplets",
   "-DVCPKG_OVERLAY_PORTS=cmake/vcpkg/ports",
diff --git a/tests/test_package.py b/tests/test_package.py
@@ -15,7 +15,7 @@ def test_version():
 
 def test_cppcheck_dir():
     output = subprocess.run(
-        [m.get_cppcheck_dir() / "cppcheck", "--version"],
+        [str(m.get_cppcheck_dir() / "cppcheck"), "--version"],
         capture_output=True,
         text=True,
         check=False,
diff --git a/vcpkg.json b/vcpkg.json
@@ -20,14 +20,14 @@
     },
     {
       "name": "cmake-modules",
-      "version": "1.6.8"
+      "version": "1.6.11"
     }
   ],
   "vcpkg-configuration": {
     "registries": [
       {
         "kind": "git",
-        "baseline": "a1d862fc6df3883df4516ccdd0c204d14cf4dc64",
+        "baseline": "09ae1472980f5e2132654900bb48061444b1cea5",
         "repository": "https://github.com/msclock/cmake-registry",
         "packages": [
           "cmake-modules",

Original file line number	Diff line number	Diff line change
`@@ -20,14 +20,14 @@`
`20`	`20`	`},`
`21`	`21`	`{`
`22`	`22`	`"name": "cmake-modules",`
`23`		`- "version": "1.6.8"`
	`23`	`+ "version": "1.6.11"`
`24`	`24`	`}`
`25`	`25`	`],`
`26`	`26`	`"vcpkg-configuration": {`
`27`	`27`	`"registries": [`
`28`	`28`	`{`
`29`	`29`	`"kind": "git",`
`30`		`- "baseline": "a1d862fc6df3883df4516ccdd0c204d14cf4dc64",`
	`30`	`+ "baseline": "09ae1472980f5e2132654900bb48061444b1cea5",`
`31`	`31`	`"repository": "https://github.com/msclock/cmake-registry",`
`32`	`32`	`"packages": [`
`33`	`33`	`"cmake-modules",`