From a48ec22b47db98ab3a5dc1e3bb00273ba05d6406 Mon Sep 17 00:00:00 2001 From: mjreno Date: Tue, 19 Sep 2023 09:55:20 -0400 Subject: [PATCH] ci4 --- .github/workflows/ci2.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci2.yml b/.github/workflows/ci2.yml index 13434212e0f..887f7de8975 100644 --- a/.github/workflows/ci2.yml +++ b/.github/workflows/ci2.yml @@ -64,14 +64,12 @@ jobs: run: | pacman -Syu pacman -S --noconfirm --needed base-devel unzip mingw-w64-x86_64-toolchain mingw-w64-x86_64-libtool mingw-w64-x86_64-cmake + which cycpath - name: Prepare netcdf build run: | mkdir ncc mkdir ncf - #cd ncf - #wget https://github.com/Unidata/netcdf-fortran/archive/refs/tags/v4.6.0.zip - #unzip v4.6.0.zip - name: Install hdf5 and netcdf-c shell: msys2 {0} @@ -96,7 +94,7 @@ jobs: LDFLAGS="-Wl,-no-undefined,--export-all-symbols" ./configure --enable-shared --disable-dap --disable-testsets --disable-examples --disable-libxml2 #LDFLAGS="-Wl,-no-undefined" ./configure --enable-shared --disable-dap --disable-examples --disable-v2 --disable-utilities --disable-testsets echo "LD_LIBRARY_PATH=/d/a/_temp/msys64/mingw64/lib" >> $GITHUB_ENV - echo "PATH=/d/a/_temp/msys64/mingw64/bin:/d/a/modflow6/modflow6/ncc/include:/d/a/modflow6/modflow6/ncf/netcdf-fortran-4.6.0/fortran/.libs:/d/a/modflow6/modflow6/modflow6/bin" >> $GITHUB_ENV + echo "PATH=/d/a/_temp/msys64/mingw64/bin:/d/a/modflow6/modflow6/ncc/include:/d/a/modflow6/modflow6/ncf/netcdf-fortran-4.6.1/fortran/.libs:/d/a/modflow6/modflow6/modflow6/bin" >> $GITHUB_ENV sed -i.bak -e "s/\(allow_undefined=\)yes/\1no/" libtool echo "grep:" grep -nrIl nc_inq_libvers . @@ -120,9 +118,10 @@ jobs: run: | #echo "LD_LIBRARY_PATH=/d/a/_temp/msys64/mingw64/lib" >> $GITHUB_ENV #echo "PATH=/d/a/_temp/msys64/mingw64/bin:/d/a/modflow6/modflow6/modflow6/bin:/d/a/modflow6/modflow6/ncf/netcdf-fortran-4.6.0/fortran/.libs" >> $GITHUB_ENV - wget https://github.com/Unidata/netcdf-fortran/archive/refs/tags/v4.6.0.zip - unzip v4.6.0.zip - cd netcdf-fortran-4.6.0 + #wget https://github.com/Unidata/netcdf-fortran/archive/refs/tags/v4.6.0.zip + wget https://github.com/Unidata/netcdf-fortran/archive/refs/tags/v4.6.1.zip + unzip v4.6.1.zip + cd netcdf-fortran-4.6.1 #LIBS="$(nc-config --libs)" ./configure --enable-static --disable-shared --prefix=/mingw64 #LIBS="$(nc-config --libs)" ./configure --enable-static --disable-shared LDFLAGS="-Wl,-no-undefined" LIBS="$(nc-config --libs)" ./configure --enable-shared @@ -158,7 +157,7 @@ jobs: echo "find netcdf:" find /d/a/_temp/msys64/mingw64 | grep -i netcdf echo "find netcdf2:" - find ../ncf/netcdf-fortran-4.6.0/fortran/.libs | grep -i netcdf + find ../ncf/netcdf-fortran-4.6.1/fortran/.libs | grep -i netcdf which nf-config which nc-config #nf-config --all