diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 69cd5ac2ef..f2c4d90e9b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -367,6 +367,7 @@ jobs: - macos-12 # latest is ARM - macos-latest + - windows-latest python-minor: - 5 - 6 @@ -420,10 +421,17 @@ jobs: key: ${{ runner.os }}-${{ github.sha }} fail-on-cache-miss: true - - name: Run python test command + - name: Install soar-sml run: | pip3.${{ matrix.python-minor }} install soar-sml -f wheelhouse --no-index - python3.${{ matrix.python-minor }} Core/ClientSMLSWIG/Python/TestPythonSML.py + + - name: Run test command (Non-Windows) + if: matrix.os != 'windows-latest' + run: python3.${{ matrix.python-minor }} Core/ClientSMLSWIG/Python/TestPythonSML.py + + - name: Run test command (Windows) + if: matrix.os == 'windows-latest' + run: py -3.${{ matrix.python-minor }} Core/ClientSMLSWIG/Python/TestPythonSML.py python_push_dev: name: Publish to test.pypi.org diff --git a/Core/ClientSMLSWIG/Python/pyproject.toml b/Core/ClientSMLSWIG/Python/pyproject.toml index aed8cd2cc7..ac65515223 100644 --- a/Core/ClientSMLSWIG/Python/pyproject.toml +++ b/Core/ClientSMLSWIG/Python/pyproject.toml @@ -139,7 +139,10 @@ test-command = "SOAR_UNIT_TEST_BASE_DIR={project}/out/ python {project}/Core/Cli test-skip = "cp38-macosx_*:arm64" [tool.cibuildwheel.windows] -# For windows we need a slightly different command +# For windows, we need to include msvcp140.dll and vcruntime140_1.dll in the wheel. +before-build = "pip install delvewheel" +repair-wheel-command = "delvewheel repair --ignore-in-wheel -w {dest_dir} {wheel}" +# For windows we need a slightly different test command test-command = """\ set SOAR_UNIT_TEST_BASE_DIR={project}/out/ python {project}/Core/ClientSMLSWIG/Python/TestPythonSML.py