From 51d2d702868e7d1955d040983ac89e6955af307f Mon Sep 17 00:00:00 2001
From: mjreno <mreno@IGSAAA071L00066.gs.doi.net>
Date: Fri, 8 Sep 2023 20:16:41 -0400
Subject: [PATCH] nc 30

---
 .github/workflows/ci.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 00de1d204e4..97f8bff509d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -363,7 +363,6 @@ jobs:
           path: modflow6
 
       - name: Setup MSYS2
-        if: runner.os == 'Windows'
         uses: msys2/setup-msys2@v2
         with:
           update: true
@@ -401,12 +400,12 @@ jobs:
 #          make all
 
       - name: Install System dependencies
-        if: runner.os == 'Windows'
         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 automake autoconf wget curl bzip2 m4 flex bison cmake tar m4
+          #pacman -Sy --noconfirm automake autoconf wget curl bzip2 m4 flex bison cmake tar
+          pacman -Sy --noconfirm automake autoconf m4 flex bison cmake
 
         ###
         # Installing libhdf4 and libhdf5
@@ -495,7 +494,6 @@ jobs:
               #- name: "Build Project"
               LD_LIBRARY_PATH=${LD_LIBRARY_PATH} cmake --build build --target all --config Release -- -j4
 
-
       - name: Print Summary
         shell: bash -l {0}
         run: |
@@ -653,9 +651,13 @@ jobs:
       - name: Perform out-of-directory build
         shell: bash -l {0}
         run: |
-              mkdir build
-              cd build
-              LD_LIBRARY_PATH=${LD_LIBRARY_PATH} cmake .. -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
+              #mkdir build
+              #cd build
+              #LD_LIBRARY_PATH=${LD_LIBRARY_PATH} cmake .. -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
+              #- name: "Create build directory and run CMake"
+              LD_LIBRARY_PATH=${LD_LIBRARY_PATH} cmake -S . -B build -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
+              #- name: "Build Project"
+              LD_LIBRARY_PATH=${LD_LIBRARY_PATH} cmake --build build --target all --config Release -- -j4
 
       - name: Print Summary
         shell: bash -l {0}