Merge pull request #147 from NOAA-EMC/ejh_version

changed version, updated doxyfile, improved CI, fixed memory leak in test
NOAA-EMC · Nov 30, 2022 · f3727bb · f3727bb
2 parents 264565a + 352e592
commit f3727bb
Show file tree

Hide file tree

Showing 8 changed files with 529 additions and 232 deletions.
diff --git a/.github/workflows/intel-linux.yml → .github/workflows/Intel.yml b/.github/workflows/intel-linux.yml → .github/workflows/Intel.yml
@@ -1,5 +1,15 @@
 name: Intel
-on: [push, pull_request]
+on:
+  push:
+    branches:
+    - develop
+    paths-ignore:
+    - README.md
+  pull_request:
+    branches:
+    - develop
+    paths-ignore:
+    - README.md
 
 # Use custom shell with -l so .bash_profile is sourced which loads intel/oneapi/setvars.sh
 # without having to do it in manually every step
@@ -59,4 +69,4 @@ jobs:
     - name: test-w3emc
       run: |
         cd w3emc/build
-        ctest --output-on-failure
+        ctest --output-on-failure --rerun-failed --verbose
diff --git a/.github/workflows/gcc10-linux.yml → .github/workflows/Linux_versions.yml b/.github/workflows/gcc10-linux.yml → .github/workflows/Linux_versions.yml
@@ -1,12 +1,25 @@
-name: GCC-10_build_and_test
-on: [push, pull_request]
+name: Linux_versions
+on:
+  push:
+    branches:
+    - develop
+    paths-ignore:
+    - README.md
+  pull_request:
+    branches:
+    - develop
+    paths-ignore:
+    - README.md
 
 jobs:
-  gcc10-build-and-test:
+  build:
     runs-on: ubuntu-latest
     env:
-      FC: gfortran-10
-      CC: gcc-10
+      FC: gfortran-11
+      CC: gcc-11
+    strategy:
+      matrix:
+        bacio-version: [2.4.1, 2.5.0]
 
     steps:
 
@@ -15,9 +28,17 @@ jobs:
       with:
         repository: NOAA-EMC/NCEPLIBS-bacio
         path: bacio
-        ref: v2.5.0
+        ref: v${{ matrix.bacio-version }}
 
+    - name: cache-bacio
+      id: cache-bacio
+      uses: actions/cache@v2
+      with:
+        path: ~/bacio
+        key: bacio-${{ runner.os }}-v${{ matrix.bacio-version }}
+
     - name: build-bacio
+      if: steps.cache-bacio.outputs.cache-hit != 'true'
       run: |
         cd bacio
         mkdir build && cd build
@@ -41,4 +62,4 @@ jobs:
     - name: test-w3emc
       run: |
         cd w3emc/build
-        ctest --output-on-failure
+        ctest --output-on-failure --rerun-failed --verbose
diff --git a/.github/workflows/macOS.yml → .github/workflows/MacOS.yml b/.github/workflows/macOS.yml → .github/workflows/MacOS.yml
@@ -1,24 +1,43 @@
-name: macOS-gcc
-on: [push, pull_request]
+name: MacOS
+on:
+  push:
+    branches:
+    - develop
+    paths-ignore:
+    - README.md
+  pull_request:
+    branches:
+    - develop
+    paths-ignore:
+    - README.md
 
 jobs:
-  macOS-build:
+  MacOS:
     runs-on: macos-latest
     env:
       FC: ${{ matrix.compiler }}
     strategy:
       matrix:
-        compiler: [gfortran-9, gfortran-10]
+        compiler: [gfortran-11, gfortran-12]
+        bacio-version: [2.4.1, 2.5.0]
 
     steps:
     - name: checkout-bacio
       uses: actions/checkout@v2
       with:
         repository: NOAA-EMC/NCEPLIBS-bacio
         path: bacio
-        ref: v2.5.0
+        ref: v${{ matrix.bacio-version }}
 
+    - name: cache-bacio
+      id: cache-bacio
+      uses: actions/cache@v2
+      with:
+        path: ~/bacio
+        key: bacio-${{ runner.os }}-v${{ matrix.bacio-version }}-${{ matrix.compiler }}
+
     - name: build-bacio
+      if: steps.cache-bacio.outputs.cache-hit != 'true'
       run: |
         cd bacio
         mkdir build && cd build
@@ -42,5 +61,5 @@ jobs:
     - name: test-w3emc
       run: |
         cd w3emc/build
-        ctest --output-on-failure
+        ctest --output-on-failure --rerun-failed --verbose
 
diff --git a/...rkflows/gcc9-debug-docs-test_coverage.yml → .github/workflows/developer.yml b/...rkflows/gcc9-debug-docs-test_coverage.yml → .github/workflows/developer.yml
@@ -1,12 +1,22 @@
-name: gcc-9_debug_docs-test_coverage
-on: [push, pull_request]
+name: developer
+on:
+  push:
+    branches:
+    - develop
+    paths-ignore:
+    - README.md
+  pull_request:
+    branches:
+    - develop
+    paths-ignore:
+    - README.md
 
 jobs:
   gcc9-debug-build:
     runs-on: ubuntu-latest
     env:
-      FC: gfortran-9
-      CC: gcc-9
+      FC: gfortran-11
+      CC: gcc-11
 
     steps:
 
@@ -20,7 +30,7 @@ jobs:
       with:
         repository: NOAA-EMC/NCEPLIBS-bacio
         path: bacio
-        ref: v2.5.0
+        ref: develop
 
     - name: build-bacio
       run: |
@@ -40,7 +50,7 @@ jobs:
         cd w3emc
         mkdir build 
         cd build
-        cmake .. -DCMAKE_PREFIX_PATH="~/;~/bacio" -DENABLE_DOCS=ON -DCMAKE_Fortran_FLAGS="-g -fprofile-arcs -ftest-coverage -O0"
+        cmake .. -DCMAKE_PREFIX_PATH="~/;~/bacio" -DENABLE_DOCS=ON -DCMAKE_Fortran_FLAGS="-g -fprofile-arcs -ftest-coverage -O0 -fsanitize=address -Wall"
         make -j2
 
     - name: build-docs
@@ -51,7 +61,7 @@ jobs:
     - name: test-w3emc
       run: |
         cd w3emc/build
-        ctest --output-on-failure
+        ctest --output-on-failure --rerun-failed --verbose
 
     - name: generate-test-coverage
       run: |

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.9.2
+2.9.3