Skip to content

Commit 17b494e

Browse files
committed
Actions: Move DYLD path manipulation after MATLAB setup on macos
1 parent 582748e commit 17b494e

1 file changed

Lines changed: 10 additions & 9 deletions

File tree

.github/workflows/unix_unit_tests.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -358,15 +358,6 @@ jobs:
358358
echo "LD_PRELOAD=$CONDA_PREFIX/lib/libstdc++.so.6" >> "$GITHUB_ENV"
359359
echo "LD_LIBRARY_PATH=$CONDA_PREFIX/lib:$LD_LIBRARY_PATH" >> "$GITHUB_ENV"
360360
361-
# macOS: MATLAB's bundled libssl is missing _SSL_get0_group_name needed by
362-
# netCDF4's libcurl. Set DYLD_LIBRARY_PATH so conda's OpenSSL is found first.
363-
- name: Fix OpenSSL compatibility for macOS
364-
if: runner.os == 'macOS'
365-
shell: bash -l {0}
366-
run: |
367-
conda activate mhkit_conda_env
368-
echo "DYLD_LIBRARY_PATH=$CONDA_PREFIX/lib:$DYLD_LIBRARY_PATH" >> "$GITHUB_ENV"
369-
370361
- name: Verify matplotlib and mhkit imports
371362
shell: bash -l {0}
372363
run: |
@@ -427,6 +418,16 @@ jobs:
427418
with:
428419
release: ${{ matrix.matlab-version }}
429420

421+
# macOS: MATLAB's bundled libssl is missing _SSL_get0_group_name needed by
422+
# netCDF4's libcurl. Set DYLD_LIBRARY_PATH so conda's OpenSSL is found first.
423+
# NOTE: Must be AFTER "Set up MATLAB" or MATLAB installer fails with _iconv error
424+
- name: Fix OpenSSL compatibility for macOS
425+
if: runner.os == 'macOS'
426+
shell: bash -l {0}
427+
run: |
428+
conda activate mhkit_conda_env
429+
echo "DYLD_LIBRARY_PATH=$CONDA_PREFIX/lib:$DYLD_LIBRARY_PATH" >> "$GITHUB_ENV"
430+
430431
# - name: Configure OpenSSL for MacOS/MATLAB
431432
# if: runner.os == 'macOS'
432433
# shell: bash -l {0}

0 commit comments

Comments
 (0)