Skip to content

Commit b4e2387

Browse files
committed
ci: Fix some bad commands and missing deps
1 parent 365e483 commit b4e2387

4 files changed

Lines changed: 6 additions & 4 deletions

File tree

.github/workflows/ci-ubuntu-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,4 @@ jobs:
5757
shell: bash -el {0}
5858
run: |
5959
cd build
60-
make uninstall
60+
ninja uninstall

.github/workflows/ci-windows-v142.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,20 @@ jobs:
4242
:: Configure
4343
cmake ^
4444
-G "Ninja" ^
45+
-DCMAKE_BUILD_TYPE=Release ^
4546
-DCMAKE_INSTALL_PREFIX=%CONDA_PREFIX%\Library ^
4647
-DPYTHON_SITELIB=%CONDA_PREFIX%\Lib\site-packages ^
4748
-DPYTHON_EXECUTABLE=%CONDA_PREFIX%\python.exe ^
4849
-DBUILD_WITH_CPPAD_CODEGEN_BINDINGS=OFF ^
4950
..
5051
5152
:: Build
52-
cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target install -j1
53+
ninja -j1
5354
5455
:: Testing
55-
set PATH=%PATH%;%CONDA_PREFIX%\Lib\site-packages\pycppad
5656
ctest --output-on-failure -C Release -V
5757
5858
:: Test Python import
59+
ninja install
5960
cd ..
6061
python -c "import pycppad"

.github/workflows/conda/conda-env-win.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ dependencies:
55
- boost
66
- eigenpy
77
- python
8+
- cppad
89
- ninja
910
- cmake
1011
- pkg-config

python/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ SET_TARGET_PROPERTIES(${PYWRAP}
3737
OUTPUT_NAME "${PYWRAP}"
3838
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/python/${PROJECT_NAME}"
3939
# On Windows, shared library are treated as binary
40-
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/python/${PROJECT_NAME}")
40+
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/python/${PROJECT_NAME}"
4141
)
4242

4343
IF(UNIX AND NOT APPLE)

0 commit comments

Comments
 (0)