GH-CI: Fix finding libR.dylib on macos
Change-Id: I3320ddfbca364eb71e824ffd8f2010794c58663c
diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
index 19d2e91..86791d8 100644
--- a/.github/workflows/pythonpackage.yml
+++ b/.github/workflows/pythonpackage.yml
@@ -25,13 +25,18 @@
with:
r-version: ${{ matrix.r-version }}
use-public-rspm: true
- cache-version: 2
- - name: Set env commands (POSIX)
- if: "!startsWith(matrix.os, 'windows')"
+ - name: Set env commands (Linux)
+ if: runner.os == 'Linux'
run: |
echo "VENV_ACTIVATE=source pyenv_base/bin/activate" >> $GITHUB_ENV
- echo "LD_LIBRARY_PATH=$(dirname $(find / -name libR.so)):${LD_LIBRARY_PATH}" >> $GITHUB_ENV
+ echo "LD_LIBRARY_PATH=$(dirname $(find / -name libR.so 2> /dev/null)):${LD_LIBRARY_PATH}" >> $GITHUB_ENV
echo "R_LIBRARY=export LD_LIBRARY_PATH=$(python -m rpy2.situation LD_LIBRARY_PATH):${LD_LIBRARY_PATH}" >> $GITHUB_ENV
+ - name: Set env commands (MacOS)
+ if: "startsWith(matrix.os, 'macos')"
+ run: |
+ echo "VENV_ACTIVATE=source pyenv_base/bin/activate" >> $GITHUB_ENV
+ echo "R_LIBRARY=$(find /Library -name libR.dylib 2> /dev/null | head -1)" >> $GITHUB_ENV
+ echo "LD_LIBRARY_PATH=$(dirname $(find /Library -name libR.dylib 2> /dev/null | head -1)):${LD_LIBRARY_PATH}" >> $GITHUB_ENV
- name: Set virtualenv activation command (Windows)
if: startsWith(matrix.os, 'windows')
shell: bash
@@ -96,7 +101,8 @@
- name: Test with pytest on POSIX
if: runner.os != 'Windows'
run: |
- export LD_LIBRARY_PATH=$(python -m rpy2.situation LD_LIBRARY_PATH):${LD_LIBRARY_PATH}
+ export LD_LIBRARY_PATH=$(dirname $R_LIBRARY):${LD_LIBRARY_PATH}
+ echo $LD_LIBRARY_PATH
python -m ensurepip --upgrade
python -m pip install pytest
pytest KorAPClient/tests --junitxml=junit/test-results-${{ matrix.python-version }}.xml