nc 34

mjreno · Sep 9, 2023 · 263aa2a · 263aa2a
1 parent d367fde
commit 263aa2a
Showing 1 changed file with 33 additions and 36 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -413,53 +413,50 @@ jobs:
         run: |
           pacman -Syu
           #pacman -Sy --noconfirm libaec-dev zlib1g-dev automake autoconf libcurl4-openssl-dev libjpeg-dev wget curl bzip2 m4 flex bison cmake libzip-dev libzstd-dev
-          pacman -Sy --noconfirm --needed automake autoconf wget curl bzip2 m4 flex bison cmake tar base-devel
+          pacman -Sy --noconfirm --needed automake autoconf 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
 
         ###
         # Installing libhdf4 and libhdf5
         ###
-      - name: Cache libhdf5-${{ matrix.hdf5 }}-${{ matrix.netcdf }}
-        id: cache-hdf5
-        uses: actions/cache@v2
-        with:
-          path: ~/environments/${{ matrix.hdf5 }}-${{ matrix.netcdf }}
-          key: hdf5-${{ runner.os }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}
+#      - name: Cache libhdf5-${{ matrix.hdf5 }}-${{ matrix.netcdf }}
+#        id: cache-hdf5
+#        uses: actions/cache@v2
+#        with:
+#          path: ~/environments/${{ matrix.hdf5 }}-${{ matrix.netcdf }}
+#          key: hdf5-${{ runner.os }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}
 
 
       - name: Build libhdf5-${{ matrix.hdf5 }}-${{ matrix.netcdf }}
         if: steps.cache-hdf5.outputs.cache-hit != 'true'
         shell: msys2 {0}
         run: |
-          #pushd $HOME
-          cd $HOME
-          wget https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-$(echo ${{ matrix.hdf5 }} | cut -d. -f 1,2)/hdf5-${{ matrix.hdf5 }}/src/hdf5-${{ matrix.hdf5 }}.tar.bz2
-          tar -jxf hdf5-${{ matrix.hdf5 }}.tar.bz2
-          #pushd hdf5-${{ matrix.hdf5 }}
-          cd hdf5-${{ matrix.hdf5 }}
-          ./configure --disable-static --enable-shared --prefix=${HOME}/environments/${{ matrix.hdf5 }}-${{ matrix.netcdf }} --enable-hl --with-szlib
-          make -j
-          make install -j
-          #popd
-
-      - name: Build 2 libhdf5-${{ matrix.hdf5 }}-${{ matrix.netcdf }}
-        shell: msys2 {0}
-        if: steps.cache-hdf5.outputs.cache-hit != 'true'
-        run: |
-          if [[ ${{ matrix.netcdf }} != "main" ]]; then
-            git clone -b ${{ matrix.netcdf}} https://github.com/Unidata/netcdf-c
-            #pushd netcdf-c
-            cd netcdf-c
-            autoreconf -if
-            CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ./configure --disable-static --enable-shared --prefix=${HOME}/environments/${{ matrix.hdf5 }}-${{ matrix.netcdf }}
-            make -j install
-            #popd
-          fi
-          #popd
-
-#      - name: Install System dependencies
-#        shell: bash -l {0}
-#        run: sudo apt update && sudo apt install -y libaec-dev zlib1g-dev automake autoconf libcurl4-openssl-dev libjpeg-dev wget curl bzip2 m4 flex bison cmake libzip-dev libzstd-dev
+          pacman -Sy mingw-w64-x86_64-hdf5
+#          #pushd $HOME
+#          cd $HOME
+#          wget https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-$(echo ${{ matrix.hdf5 }} | cut -d. -f 1,2)/hdf5-${{ matrix.hdf5 }}/src/hdf5-${{ matrix.hdf5 }}.tar.bz2
+#          tar -jxf hdf5-${{ matrix.hdf5 }}.tar.bz2
+#          #pushd hdf5-${{ matrix.hdf5 }}
+#          cd hdf5-${{ matrix.hdf5 }}
+#          ./configure --disable-static --enable-shared --prefix=${HOME}/environments/${{ matrix.hdf5 }}-${{ matrix.netcdf }} --enable-hl --with-szlib
+#          make -j
+#          make install -j
+#          #popd
+
+#      - name: Make libhdf5-${{ matrix.hdf5 }}-${{ matrix.netcdf }}
+#        if: steps.cache-hdf5.outputs.cache-hit != 'true'
+#        shell: msys2 {0}
+#        run: |
+#          if [[ ${{ matrix.netcdf }} != "main" ]]; then
+#            git clone -b ${{ matrix.netcdf}} https://github.com/Unidata/netcdf-c
+#            #pushd netcdf-c
+#            cd netcdf-c
+#            autoreconf -if
+#            CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ./configure --disable-static --enable-shared --prefix=${HOME}/environments/${{ matrix.hdf5 }}-${{ matrix.netcdf }}
+#            make -j install
+#            #popd
+#          fi
+#          #popd
 
 ###
 # Set Environmental Variables