Merge pull request #418 from WardF/gh380.wif

nf-config uses install libdir variable
Unidata · Nov 29, 2023 · 155d387 · 155d387
2 parents 5f02e6a + 1dc9d5e
commit 155d387
Show file tree

Hide file tree

Showing 44 changed files with 191,407 additions and 13 deletions.
diff --git a/.github/workflows/run_tests_linux.yml b/.github/workflows/run_tests_linux.yml
@@ -6,6 +6,10 @@ name: Run netCDF-Fortran Linux tests
 
 on: [pull_request, workflow_dispatch]
 
+concurrency:  
+  group: ${{ github.workflow}}-${{ github.head_ref }}  
+  cancel-in-progress: true
+
 jobs:
 
   build-deps:
@@ -15,7 +19,7 @@ jobs:
     strategy:
       matrix:
         hdf5: [ 1.12.2 ]
-        netcdf: [ v4.7.4, v4.8.1, v4.9.0, main ]
+        netcdf: [ v4.7.4, v4.8.1, v4.9.0 ]
 
     steps:
 
@@ -71,7 +75,7 @@ jobs:
     strategy:
       matrix:
         hdf5: [ 1.12.2 ]
-        netcdf: [ v4.7.4, v4.8.1, v4.9.0, main ]
+        netcdf: [ v4.7.4, v4.8.1, v4.9.0 ]
 
     steps:
 
@@ -130,7 +134,7 @@ jobs:
     strategy:
       matrix:
         hdf5: [ 1.12.2 ]
-        netcdf: [ v4.7.4, v4.8.1, v4.9.0, main ]
+        netcdf: [ v4.7.4, v4.8.1, v4.9.0 ]
 
     steps:
 
@@ -227,7 +231,7 @@ jobs:
     strategy:
       matrix:
         hdf5: [ 1.12.2 ]
-        netcdf: [ v4.7.4, v4.8.1, v4.9.0, main ]
+        netcdf: [ v4.7.4, v4.8.1, v4.9.0 ]
 
     steps:
 
@@ -325,7 +329,7 @@ jobs:
     strategy:
       matrix:
         hdf5: [ 1.12.2 ]
-        netcdf: [ v4.7.4, v4.8.1, v4.9.0, main ]
+        netcdf: [ v4.7.4, v4.8.1, v4.9.0 ]
 
     steps:
 

diff --git a/.github/workflows/run_tests_macos.yml b/.github/workflows/run_tests_macos.yml
@@ -6,6 +6,9 @@ name: Run netCDF-Fortran MacOS tests
 
 on: [ workflow_dispatch ]
 
+concurrency:  
+  group: ${{ github.workflow}}-${{ github.head_ref }}  
+  cancel-in-progress: true
 
 jobs: