From 8433e497787f8d0b118449009ba93a83d2b07de6 Mon Sep 17 00:00:00 2001 From: mjreno Date: Thu, 7 Sep 2023 12:22:12 -0400 Subject: [PATCH] netcdf 17 --- .github/workflows/ci.yml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8f35e5719e..4ae4caa3f3f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -273,17 +273,17 @@ jobs: - name: Show win1 netcdf-fortran.pc if: runner.os == 'Windows' working-directory: modflow6 - run: ls -l /Users/runneradmin/micromamba/envs/modflow6/Library/lib + run: ls -l C:/Users/runneradmin/micromamba/envs/modflow6/Library/lib - name: Show win2 netcdf-fortran.pc if: runner.os == 'Windows' working-directory: modflow6 - run: ls -l /Users/runneradmin/micromamba/envs/modflow6/Library/lib/pkgconfig + run: ls -l C:/Users/runneradmin/micromamba/envs/modflow6/Library/lib/pkgconfig - name: Cat win netcdf-fortran.pc if: runner.os == 'Windows' working-directory: modflow6 - run: cat /Users/runneradmin/micromamba/envs/modflow6/Library/lib/pkgconfig/netcdf-fortran.pc + run: cat C:/Users/runneradmin/micromamba/envs/modflow6/Library/lib/pkgconfig/netcdf-fortran.pc #- name: Edit netcdf-fortran.pc # if: runner.os == 'Windows' @@ -452,9 +452,15 @@ jobs: cache-downloads: true - name: Edit netcdf-fortran.pc + if: runner.os == 'Linux' working-directory: modflow6 run: 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 + - name: Edit netcdf-fortran.pc + if: runner.os == 'macOS' + working-directory: modflow6 + run: 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 + - name: Setup Intel Fortran uses: awvwgk/setup-fortran@main with: @@ -628,9 +634,15 @@ jobs: cache-downloads: true - name: Edit netcdf-fortran.pc + if: runner.os == 'Linux' working-directory: modflow6 run: 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 + - name: Edit netcdf-fortran.pc + if: runner.os == 'macOS' + working-directory: modflow6 + run: 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 + - name: Build modflow6 working-directory: modflow6 run: |