From 53121ce50e796f66e48bd25a2b809ce71e1535a8 Mon Sep 17 00:00:00 2001 From: mjreno Date: Sat, 9 Sep 2023 19:16:00 -0400 Subject: [PATCH] nc11 --- .github/workflows/ci.yml | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index be5a37ff46a..2c9a6db486e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -422,6 +422,19 @@ jobs: pacman -Sy --noconfirm --needed automake autoconf libxml2 libtool git wget curl bzip2 m4 flex bison cmake tar base-devel #pacman -Sy --noconfirm --needed base-devel automake autoconf m4 flex bison cmake base-devel +# --prefix -> /mingw64 +# --includedir -> /mingw64/include +# --libdir -> /mingw64/lib + - name: Install System dependencies + shell: msys2 {0} + run: | + #echo "CFLAGS=-I${HOME}/environments/${{ matrix.hdf5 }}-${{ matrix.netcdf }}/include" >> $GITHUB_ENV + #echo "LDFLAGS=-L${HOME}/environments/${{ matrix.hdf5 }}-${{ matrix.netcdf }}/lib" >> $GITHUB_ENV + #echo "LD_LIBRARY_PATH=${HOME}/environments/${{ matrix.hdf5 }}-${{ matrix.netcdf }}/lib" >> $GITHUB_ENV + echo "CFLAGS=-I/mingw64/include" >> $GITHUB_ENV + echo "LDFLAGS=-L/mingw64/lib" >> $GITHUB_ENV + echo "LD_LIBRARY_PATH=/mingw64/lib" >> $GITHUB_ENV + ### # Installing libhdf4 and libhdf5 ### @@ -646,7 +659,7 @@ jobs: - name: Build libhdf5-${{ matrix.hdf5 }}-${{ matrix.netcdf }} - if: steps.cache-hdf5.outputs.cache-hit != 'true' + #if: steps.cache-hdf5.outputs.cache-hit != 'true' run: | #pushd $HOME cd $HOME @@ -660,7 +673,7 @@ jobs: #popd - name: Build 2 libhdf5-${{ matrix.hdf5 }}-${{ matrix.netcdf }} - if: steps.cache-hdf5.outputs.cache-hit != 'true' + #if: steps.cache-hdf5.outputs.cache-hit != 'true' run: | cd $HOME git clone -b ${{ matrix.netcdf}} https://github.com/Unidata/netcdf-c @@ -757,7 +770,7 @@ jobs: - lint - build - smoke_test - - netcdf_test + - netcdf_test_win runs-on: ${{ matrix.os }} strategy: fail-fast: false @@ -898,7 +911,7 @@ jobs: - lint - build - smoke_test - - netcdf_test + - netcdf_test_win runs-on: ${{ matrix.os }} strategy: fail-fast: false @@ -1032,7 +1045,7 @@ jobs: - lint - build - smoke_test - - netcdf_test + - netcdf_test_win runs-on: ${{ matrix.os }} strategy: fail-fast: false