From 0a13928dd5a084f97676ec463736e951018ac29a Mon Sep 17 00:00:00 2001 From: Danny Farrell <16297104+danpf@users.noreply.github.com> Date: Wed, 15 Nov 2023 18:31:03 -0600 Subject: [PATCH] more checking --- .github/workflows/pip.yml | 24 +++++++++++++++++++++++- .github/workflows/wheels.yml | 6 +++--- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pip.yml b/.github/workflows/pip.yml index 76d4c67..a8cde31 100644 --- a/.github/workflows/pip.yml +++ b/.github/workflows/pip.yml @@ -16,6 +16,21 @@ jobs: matrix: platform: [windows-latest, macos-latest, ubuntu-latest] python-version: ["3.8", "3.11", "3.12", "pypy-3.8"] + # include: + # - os: windows-latest + # cc: gcc + # cxx: g++ + # shell: 'msys2 {0}' + runs-on: ${{ matrix.os }} + defaults: + run: + shell: ${{ matrix.shell }} + env: + CC: ${{ matrix.cc }} + CXX: ${{ matrix.cxx }} + ARCH: ${{ matrix.arch }} + CMAKE_ARGS: ${{ matrix.cmake_args }} + steps: - uses: actions/checkout@v4 @@ -27,9 +42,16 @@ jobs: with: python-version: ${{ matrix.python-version }} + - name: Setup cmake + uses: jwlawson/actions-setup-cmake@v1.13 + with: + cmake-version: '3.16.x' + + - uses: seanmiddleditch/gha-setup-ninja@master + - name: Build and install run: pip install --verbose . - name: Test - run: python -m unittest src/python/tests/tests.py + run: python src/python/tests/tests.py diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 5f7feb3..e4f92b5 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -50,9 +50,9 @@ jobs: with: submodules: true - - name: Set CMAKE_GENERATOR for Windows - if: matrix.os == 'windows-latest' - run: echo "CMAKE_GENERATOR=MinGW Makefiles" >> $GITHUB_ENV + # - name: Set CMAKE_GENERATOR for Windows + # if: matrix.os == 'windows-latest' + # run: echo "CMAKE_GENERATOR=MinGW Makefiles" >> $GITHUB_ENV - uses: pypa/cibuildwheel@v2.16.2 env: