Skip to content

Commit 5f97936

Browse files
authored
Update ci.yml (#402)
* Update ci.yml * Update ci.yml * Update ci.yml * Add pybind_DIR to CMAKE_PREFIX_PATH
1 parent 31d6dab commit 5f97936

File tree

1 file changed

+4
-19
lines changed

1 file changed

+4
-19
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,14 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
os: [ubuntu-20.04, macos-11, windows-2019]
21+
os: [ubuntu-22.04, macos-13, windows-2022]
2222
sofa_branch: [master]
23-
python_version: ['3.8']
23+
python_version: ['3.10']
2424

2525
steps:
26-
- name: (Mac) Workaround for homebrew
27-
shell: bash
28-
if: runner.os == 'macOS'
29-
run: |
30-
rm -f /usr/local/bin/2to3
31-
rm -f /usr/local/bin/idle3
32-
rm -f /usr/local/bin/pydoc3
33-
rm -f /usr/local/bin/python3
34-
rm -f /usr/local/bin/python3-config
35-
rm -f /usr/local/bin/2to3-3.11
36-
rm -f /usr/local/bin/idle3.11
37-
rm -f /usr/local/bin/pydoc3.11
38-
rm -f /usr/local/bin/python3.11
39-
rm -f /usr/local/bin/python3.11-config
40-
4126
- name: Setup SOFA and environment
4227
id: sofa
43-
uses: sofa-framework/sofa-setup-action@v4
28+
uses: sofa-framework/sofa-setup-action@v5
4429
with:
4530
sofa_root: ${{ github.workspace }}/sofa
4631
sofa_version: ${{ matrix.sofa_branch }}
@@ -66,7 +51,7 @@ jobs:
6651
cmake_options="-GNinja \
6752
-DCMAKE_BUILD_TYPE=Release \
6853
-DCMAKE_INSTALL_PREFIX="$WORKSPACE_INSTALL_PATH" \
69-
-DCMAKE_PREFIX_PATH="$SOFA_ROOT/lib/cmake" \
54+
-DCMAKE_PREFIX_PATH="$SOFA_ROOT/lib/cmake:$pybind11_DIR" \
7055
-DPYTHON_ROOT=$PYTHON_ROOT -DPython_ROOT=$PYTHON_ROOT \
7156
-DPYTHON_EXECUTABLE=$PYTHON_EXE -DPython_EXECUTABLE=$PYTHON_EXE"
7257
if [ -e "$(command -v ccache)" ]; then

0 commit comments

Comments
 (0)