removing the caching from windows stuff, didn't know what I was doing

Unidata · Mar 15, 2024 · 81b0ca0 · 81b0ca0
1 parent 0dc595c
commit 81b0ca0
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 47 deletions.
diff --git a/.github/workflows/run_tests_osx.yml b/.github/workflows/run_tests_osx.yml
@@ -488,7 +488,7 @@ jobs:
       - name: Run Cmake 
         run: |
           cd integration_tests/fetch_content
-          cmake -S . -B build -D
+          cmake -S . -B build 
 
       - name: Build
         run: |

diff --git a/.github/workflows/run_tests_ubuntu.yml b/.github/workflows/run_tests_ubuntu.yml
@@ -898,7 +898,7 @@ jobs:
       - name: Run Cmake 
         run: |
           cd integration_tests/fetch_content
-          cmake -S . -B build -D
+          cmake -S . -B build
 
       - name: Build
         run: |

diff --git a/.github/workflows/run_tests_win_cygwin.yml b/.github/workflows/run_tests_win_cygwin.yml
@@ -12,34 +12,7 @@ env:
   CYGWIN_NOWINPATH: 1
 
 jobs:
-  build-deps:
-    runs-on: windows-latest
-
-    steps:
-
-      - uses: actions/checkout@v3
-
-      - name: Cache netcdf-dependencies
-        id: cache-netcdf-dependencies
-        uses: actions/cache@v3
-        with:
-          path: ~/environments/netcdf-dependencies
-          key: netcdf-dependencies
-
-      - name: Build and install dependencies
-        if: steps.cache-netcdf-dependencies.outputs.cache-hit != 'true'
-        uses: cygwin/cygwin-install-action@v2
-        with:
-          platform: x86_64
-          packages: >-
-            git automake libtool autoconf2.5 make libhdf5-devel
-            libhdf4-devel zipinfo libxml2-devel perl zlib-devel
-            libzstd-devel libbz2-devel libaec-devel libzip-devel
-            libdeflate-devel gcc-core libcurl-devel libiconv-devel
-            libssl-devel libcrypt-devel
-
   build-and-test-autotools:
-    needs: build-deps
     runs-on: windows-latest
     defaults:
       run:
@@ -57,6 +30,18 @@ jobs:
 
       - uses: actions/checkout@v3
 
+      - name: Build and install dependencies
+        if: steps.cache-netcdf-dependencies.outputs.cache-hit != 'true'
+        uses: cygwin/cygwin-install-action@v2
+        with:
+          platform: x86_64
+          packages: >-
+            git automake libtool autoconf2.5 make libhdf5-devel
+            libhdf4-devel zipinfo libxml2-devel perl zlib-devel
+            libzstd-devel libbz2-devel libaec-devel libzip-devel
+            libdeflate-devel gcc-core libcurl-devel libiconv-devel
+            libssl-devel libcrypt-devel
+
       - name: (Autotools) Run autoconf and friends
         run: |
           cp -f /bin/dash /bin/sh
@@ -98,15 +83,30 @@ jobs:
           make check -j8 SHELL=/bin/dash
 
   fetch_content_cmake:
-    needs: build-deps
     runs-on: windows-latest
+    defaults:
+      run:
+        shell: bash -eo pipefail -o igncr "{0}"
+
     steps:
       - uses: actions/checkout@v3
 
+      - name: Build and install dependencies
+        if: steps.cache-netcdf-dependencies.outputs.cache-hit != 'true'
+        uses: cygwin/cygwin-install-action@v2
+        with:
+          platform: x86_64
+          packages: >-
+            git automake libtool autoconf2.5 make libhdf5-devel
+            libhdf4-devel zipinfo libxml2-devel perl zlib-devel
+            libzstd-devel libbz2-devel libaec-devel libzip-devel
+            libdeflate-devel gcc-core libcurl-devel libiconv-devel
+            libssl-devel libcrypt-devel
+
       - name: Run Cmake 
         run: |
           cd integration_tests/fetch_content
-          cmake -S . -B build -D
+          cmake -S . -B build 
 
       - name: Build
         run: |

diff --git a/.github/workflows/run_tests_win_mingw.yml b/.github/workflows/run_tests_win_mingw.yml
@@ -16,7 +16,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build-deps:
+  build-and-test-autotools:
 
     runs-on: windows-latest
     defaults:
@@ -26,24 +26,12 @@ jobs:
     steps:
 
       - uses: actions/checkout@v3
+
       - uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64
           update: true
           install: git mingw-w64-x86_64-toolchain automake libtool autoconf make cmake mingw-w64-x86_64-hdf5 unzip mingw-w64-x86_64-libxml2 mingw-w64-x86_64-zlib
-
-  build-and-test-autotools:
-
-    needs: build-deps
-    runs-on: windows-latest
-    defaults:
-      run:
-        shell: msys2 {0}
-
-    steps:
-
-      - uses: actions/checkout@v3
-
 ###
 # Configure and build
 ###
@@ -87,7 +75,6 @@ jobs:
 
   fetch_content_cmake:
 
-    needs: build-deps
     runs-on: windows-latest
 
     defaults:
@@ -97,10 +84,16 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: MINGW64
+          update: true
+          install: git mingw-w64-x86_64-toolchain automake libtool autoconf make cmake mingw-w64-x86_64-hdf5 unzip mingw-w64-x86_64-libxml2 mingw-w64-x86_64-zlib
+
       - name: Run Cmake 
         run: |
           cd integration_tests/fetch_content
-          cmake -S . -B build -D
+          cmake -S . -B build 
 
       - name: Build
         run: |