Skip to content

Commit a7ebde5

Browse files
committed
Clean up commit -- make path dependent on os
1 parent 3ec7659 commit a7ebde5

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

.github/workflows/build.yml

+15-6
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,15 @@ jobs:
4949
if: runner.os == 'Windows'
5050
uses: microsoft/[email protected]
5151

52+
- name: Setup Visual Studio Developer Command Prompt
53+
if: runner.os == 'Windows'
54+
uses: ilammy/msvc-dev-cmd@v1
55+
56+
- name: Install Windows development tools
57+
if: runner.os == 'Windows'
58+
run: |
59+
choco install visualstudio2019buildtools visualstudio2019-workload-vctools cmake
60+
5261
- name: Setup C++ toolchain (macOS)
5362
if: runner.os == 'macOS'
5463
run: |
@@ -63,13 +72,13 @@ jobs:
6372
CIBW_BEFORE_BUILD: >
6473
python -c "import utils; utils.GeosLibrary('${{ env.GEO_VERSION }}').build('extern', njobs=16)"
6574
CIBW_ENVIRONMENT: >
66-
GEOS_DIR=/project/extern
67-
CPATH=/projectextern/include
68-
LIBRARY_PATH=/project/extern/lib
69-
LD_LIBRARY_PATH=/project/extern/lib
70-
SETUPTOOLS_USE_DISTUTILS=stdlib
75+
GEOS_DIR=${{ github.workspace }}${{ runner.os == 'Windows' && '\\extern' || '/extern' }}
76+
CFLAGS=-I${{ github.workspace }}${{ runner.os == 'Windows' && '\\extern\\include' || '/extern/include' }}
77+
LDFLAGS=-L${{ github.workspace }}${{ runner.os == 'Windows' && '\\extern\\lib' || '/extern/lib' }}
7178
CIBW_TEST_COMMAND: >
72-
cd {project} && python -m pytest --cov="mpl_toolkits.basemap"
79+
cd {project}
80+
pip install pytest
81+
python -m pytest --cov="mpl_toolkits.basemap"
7382
--cov-report=term --ignore=dist --ignore=build
7483
CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-*"
7584
run: |

0 commit comments

Comments
 (0)