From 8b904e8f36f066bf4ae9ee6e88f8b246b61dcaef Mon Sep 17 00:00:00 2001 From: mjreno Date: Fri, 17 Nov 2023 09:08:40 -0500 Subject: [PATCH] extended 13 --- .github/workflows/ci-nc.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-nc.yml b/.github/workflows/ci-nc.yml index 3de3c6fedab..2c0a0237fe2 100644 --- a/.github/workflows/ci-nc.yml +++ b/.github/workflows/ci-nc.yml @@ -160,11 +160,13 @@ jobs: - name: Edit netcdf-fortran.pc working-directory: modflow6 run: | - if [ "$RUNNER_OS" == "Linux" ]; then - sed -i "s|libdir=/home/runner/micromamba/envs/modflow6//home/runner/micromamba/envs/modflow6/lib|libdir=/home/runner/micromamba/envs/modflow6/lib|g" /home/runner/micromamba/envs/modflow6/lib/pkgconfig/netcdf-fortran.pc - elif [ "$RUNNER_OS" == "macOS" ]; then - sed -i '' -e "s|libdir=/Users/runner/micromamba/envs/modflow6//Users/runner/micromamba/envs/modflow6/lib|libdir=/Users/runner/micromamba/envs/modflow6/lib|g" /Users/runner/micromamba/envs/modflow6/lib/pkgconfig/netcdf-fortran.pc - fi + if [ "$RUNNER_OS" == "Linux" ]; then + echo "PKG_CONFIG_PATH=/home/runner/micromamba/envs/modflow6/lib/pkgconfig:$PKG_CONFIG_PATH" >> $GITHUB_ENV +# sed -i "s|libdir=/home/runner/micromamba/envs/modflow6//home/runner/micromamba/envs/modflow6/lib|libdir=/home/runner/micromamba/envs/modflow6/lib|g" /home/runner/micromamba/envs/modflow6/lib/pkgconfig/netcdf-fortran.pc + elif [ "$RUNNER_OS" == "macOS" ]; then + echo "PKG_CONFIG_PATH=/Users/runner/micromamba/envs/modflow6/lib/pkgconfig:$PKG_CONFIG_PATH" >> $GITHUB_ENV +# sed -i '' -e "s|libdir=/Users/runner/micromamba/envs/modflow6//Users/runner/micromamba/envs/modflow6/lib|libdir=/Users/runner/micromamba/envs/modflow6/lib|g" /Users/runner/micromamba/envs/modflow6/lib/pkgconfig/netcdf-fortran.pc + fi - name: Build modflow6 working-directory: modflow6