Skip to content

ci: setup vcpkg env properly #44

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Nov 30, 2024
Merged

ci: setup vcpkg env properly #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 0 additions & 12 deletions .github/workflows/cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,18 +72,6 @@ jobs:
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
if: runner.os == 'Linux' && contains(matrix.use_qemu, matrix.arch)

- name: Check architecture and set environment variable
if: runner.os == 'Linux'
run: |
echo "Checking architecture..."
if [[ ${{ matrix.arch }} == "aarch64" ||
${{ matrix.arch }} == "ppc64le" ||
${{ matrix.arch }} == "s390x" ||
${{ matrix.arch }} == *"arm"* ]]; then
echo "Set VCPKG_FORCE_SYSTEM_BINARIES=1"
echo "CIBW_ENVIRONMENT=VCPKG_FORCE_SYSTEM_BINARIES=1" >> $GITHUB_ENV
fi

- name: Build wheels
uses: pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969 # v2.22.0
env:
Expand Down
18 changes: 11 additions & 7 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ name = "cppcheck"
description = "Package cppcheck as a python wheel."
readme = "README.md"
license = { text = "Apache-2.0" }
authors = [
{ email = "[email protected]", name = "msclock" },
]
authors = [{ email = "[email protected]", name = "msclock" }]
requires-python = ">=3.7"
classifiers = [
"Intended Audience :: Science/Research",
Expand Down Expand Up @@ -66,10 +64,10 @@ metadata.version.provider = "scikit_build_core.metadata.setuptools_scm"
sdist.include = ["src/cppcheck/_version.py"]
cmake.args = [
"-DBUILD_TESTING=OFF",
"-DCMAKE_BUILD_TYPE=ReWithDebInfo", # Required RelWithDebInfo or Release
"-DCMAKE_BUILD_TYPE=ReWithDebInfo", # Required RelWithDebInfo or Release
"-DCMAKE_TOOLCHAIN_FILE=cmake/vcpkg/vcpkg.toolchain.cmake",
"-DVCPKG_OVERLAY_TRIPLETS=cmake/vcpkg/triplets",
"-DVCPKG_OVERLAY_PORTS=cmake/vcpkg/ports"
"-DVCPKG_OVERLAY_PORTS=cmake/vcpkg/ports",
]

[tool.setuptools_scm]
Expand All @@ -82,13 +80,19 @@ test-extras = ["test"]
test-skip = ["*-win_arm64", "*-macosx_universal2:arm64"]

[tool.cibuildwheel.linux]
before-build =[
before-build = [
'yum install zip -y || apk add zip || true',
'apt update && apt install zip pkg-config -y || true',
'pip install cmake ninja',
'cmake --version', 'git --version', 'ninja --version',
'cmake --version',
'git --version',
'ninja --version',
]

[[tool.cibuildwheel.overrides]]
select = "*linux_{aarch64,armv7l,ppc64le,s390x}"
environment = { VCPKG_FORCE_SYSTEM_BINARIES = "1" }

[tool.pytest.ini_options]
minversion = "6.0"
addopts = ["-ra", "--showlocals", "--strict-markers", "--strict-config"]
Expand Down
Loading