nc 26

mjreno · Sep 8, 2023 · 93446eb · 93446eb
1 parent f236d4f
commit 93446eb
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -146,7 +146,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-22.04, macos-12, windows-2022 ]
+        os: [ ubuntu-22.04, windows-2022 ]
         hdf5: [ 1.12.2 ]
         #netcdf: [ v4.7.4, v4.8.1, v4.9.0, main ]
         netcdf: [ v4.9.0, main ]
@@ -228,7 +228,7 @@ jobs:
 #          make all
 
       - name: Install System dependencies
-        if: runner.os != 'Windows'
+        if: runner.os == 'Linux'
         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 gfortran
 #        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 gfortran
@@ -238,13 +238,14 @@ jobs:
         shell: msys2 {0}
         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 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 automake autoconf wget curl bzip2 m4 flex bison cmake
 
         ###
         # Set Environmental Variables
         ###
       - name: Install System dependencies
-        if: runner.os != 'Windows'
+        if: runner.os == 'Linux'
         shell: bash -l {0}
         run: |
           echo "CFLAGS=-I${HOME}/environments/${{ matrix.hdf5 }}-${{ matrix.netcdf }}/include" >> $GITHUB_ENV
@@ -336,7 +337,7 @@ jobs:
         run: |
               mkdir build
               cd build
-              LD_LIBRARY_PATH=${LD_LIBRARY_PATH} cmake .. -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
+              LD_LIBRARY_PATH=${LD_LIBRARY_PATH} cmake $(pwd)/../ -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
 
       - name: Print Summary
         shell: bash -l {0}