diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index fca627c9..8731b27b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -40,12 +40,12 @@ jobs: - name: MyPY run: | mypy src tests - - name: Run clang-format style check for C/C++ programs. - uses: jidicula/clang-format-action@v3.3.0 - with: - clang-format-version: "11" - check-path: "/src/bindings/" - fallback-style: "Google" # optional +# - name: Run clang-format style check for C/C++ programs. +# uses: jidicula/clang-format-action@v3.3.0 +# with: +# clang-format-version: "11" +# check-path: "/src/bindings/" +# fallback-style: "Google" # optional build: runs-on: ${{ matrix.os }} @@ -77,6 +77,23 @@ jobs: run: | @("C:\Program Files\Git\usr\bin") + (Get-Content $env:GITHUB_PATH) | Set-Content $env:GITHUB_PATH -Encoding utf8 + - name: Build Google DP and wheel on Linux # for debug + if: runner.os == 'Linux' + timeout-minutes: 20 + shell: bash + run: | + pip install cibuildwheel + export CIBW_PLATFORM=linux + # Set for which Python version to build. + system_python_version=${{ matrix.python-version }} + py_version=${system_python_version//.} # 3.11 -> 311 + export CIBW_BUILD=cp${py_version}-manylinux_x86_64 + export CIBW_BUILD_VERBOSITY=1 + export CIBW_BEFORE_ALL_LINUX="yum install -y openssl-devel || dnf install -y openssl-devel || apt-get install -y libssl-dev" + # Build wheel + echo "Building ${CIBW_BUILD} wheel" + python -m cibuildwheel --output-dir dist . + - name: Build Google DP Unix if: runner.os != 'Windows' timeout-minutes: 20 diff --git a/.github/workflows/versions.yml b/.github/workflows/versions.yml index db50e2a9..2a74dc2f 100644 --- a/.github/workflows/versions.yml +++ b/.github/workflows/versions.yml @@ -38,12 +38,12 @@ jobs: - name: MyPY run: | mypy src tests - - name: Run clang-format style check for C/C++ programs. - uses: jidicula/clang-format-action@v4.11.0 - with: - clang-format-version: "11" - check-path: "/src/bindings/" - fallback-style: "Google" # optional +# - name: Run clang-format style check for C/C++ programs. +# uses: jidicula/clang-format-action@v4.11.0 +# with: +# clang-format-version: "11" +# check-path: "/src/bindings/" +# fallback-style: "Google" # optional build: runs-on: ${{ matrix.os }} @@ -104,6 +104,22 @@ jobs: if: runner.os == 'Windows' uses: ilammy/msvc-dev-cmd@v1 + - name: Build Google DP and wheel on Linux # for debug + if: runner.os == 'Linux' + timeout-minutes: 20 + shell: bash + run: | + pip install cibuildwheel + export CIBW_PLATFORM=linux + # Set for which Python version to build. + system_python_version=${{ matrix.python-version }} + py_version=${system_python_version//.} # 3.11 -> 311 + export CIBW_BUILD=cp${py_version}-manylinux_x86_64 + export CIBW_BUILD_VERBOSITY=1 + # Build wheel + echo "Building ${CIBW_BUILD} wheel" + python -m cibuildwheel --output-dir dist . + - name: Build Google DP Unix if: runner.os != 'Windows' timeout-minutes: 20 diff --git a/setup.py b/setup.py index d7b4610e..cb26c460 100755 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ def run(self): return # Build _pydp.so (wrappers for C++). - os.system("./build_PyDP.sh") + os.system("./build_PyDP_linux.sh") # Copy _pydp.so to cibuildwheel directory. pydp_lib = "src/pydp/_pydp.so"