Merge with develop (#2790)

1 files changed, 75 insertions, 4 deletions

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f5534ec..277262c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,7 +17,7 @@ on:
 
 # Using concurrency to cancel any in-progress job or run
 concurrency:
-  group: ${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.sha || github.event.pull_request.number }}
   cancel-in-progress: true
 
 # A workflow run is made up of one or more jobs that can run sequentially or
@@ -118,6 +118,7 @@ jobs:
             direct_vfd: enable
             deprec_sym: enable
             default_api: v114
+            szip: yes
             toolchain: ""
             generator: "autogen"
             flags: ""
@@ -138,6 +139,7 @@ jobs:
             direct_vfd: disable
             deprec_sym: enable
             default_api: v114
+            szip: yes
             toolchain: ""
             generator: "autogen"
             flags: "CC=mpicc"
@@ -180,6 +182,7 @@ jobs:
             direct_vfd: enable
             deprec_sym: enable
             default_api: v16
+            szip: yes
             toolchain: ""
             generator: "autogen"
             flags: ""
@@ -202,6 +205,7 @@ jobs:
             direct_vfd: enable
             deprec_sym: enable
             default_api: v18
+            szip: yes
             toolchain: ""
             generator: "autogen"
             flags: ""
@@ -224,6 +228,7 @@ jobs:
             direct_vfd: enable
             deprec_sym: enable
             default_api: v110
+            szip: yes
             toolchain: ""
             generator: "autogen"
             flags: ""
@@ -246,6 +251,7 @@ jobs:
             direct_vfd: enable
             deprec_sym: enable
             default_api: v112
+            szip: yes
             toolchain: ""
             generator: "autogen"
             flags: ""
@@ -267,7 +273,8 @@ jobs:
             mirror_vfd: enable
             direct_vfd: enable
             deprec_sym: disable
-            default_api: v114
+            default_api: default
+            szip: yes
             toolchain: ""
             generator: "autogen"
             flags: ""
@@ -290,6 +297,7 @@ jobs:
             direct_vfd: enable
             deprec_sym: enable
             default_api: v114
+            szip: yes
             toolchain: ""
             generator: "autogen"
             flags: "CFLAGS=-Werror"
@@ -312,6 +320,53 @@ jobs:
             direct_vfd: enable
             deprec_sym: enable
             default_api: v114
+            szip: yes
+            toolchain: ""
+            generator: "autogen"
+            flags: "CFLAGS=-Werror"
+            run_tests: false
+            thread_safety:
+              enabled: false
+              text: ""
+            build_mode:
+              text: " REL"
+              cmake: "Release"
+              autotools: "production"
+
+          # Parallel Debug -Werror
+          - name: "Ubuntu gcc Autotools parallel -Werror (build only)"
+            os: ubuntu-latest
+            cpp: disable
+            fortran: disable
+            java: disable
+            parallel: enable
+            mirror_vfd: disable
+            direct_vfd: enable
+            deprec_sym: enable
+            default_api: v114
+            toolchain: ""
+            generator: "autogen"
+            flags: "CFLAGS=-Werror"
+            run_tests: false
+            thread_safety:
+              enabled: false
+              text: ""
+            build_mode:
+              text: " DBG"
+              cmake: "Debug"
+              autotools: "debug"
+
+          # Parallel production/release -Werror
+          - name: "Ubuntu gcc Autotools parallel -Werror (build only)"
+            os: ubuntu-latest
+            cpp: disable
+            fortran: disable
+            java: disable
+            parallel: enable
+            mirror_vfd: disable
+            direct_vfd: enable
+            deprec_sym: enable
+            default_api: v114
             toolchain: ""
             generator: "autogen"
             flags: "CFLAGS=-Werror"
@@ -356,6 +411,7 @@ jobs:
            echo "CC=gcc-11" >> $GITHUB_ENV
            echo "CXX=g++-11" >> $GITHUB_ENV
            echo "FC=gfortran-11" >> $GITHUB_ENV
+           sudo apt install libaec0 libaec-dev
         if: (matrix.generator == 'autogen') && (matrix.parallel != 'enable')
 
       - name: Install Autotools Dependencies (Linux, parallel)
@@ -365,6 +421,7 @@ jobs:
            sudo apt install openmpi-bin openmpi-common mpi-default-dev
            echo "CC=mpicc" >> $GITHUB_ENV
            echo "FC=mpif90" >> $GITHUB_ENV
+           sudo apt install libaec0 libaec-dev
         if: (matrix.generator == 'autogen') && (matrix.parallel == 'enable')
 
       - name: Install Dependencies (Windows)
@@ -395,7 +452,7 @@ jobs:
           sh ./autogen.sh
           mkdir "${{ runner.workspace }}/build"
           cd "${{ runner.workspace }}/build"
-          ${{ matrix.flags }} $GITHUB_WORKSPACE/configure --enable-build-mode=${{ matrix.build_mode.autotools }} --${{ matrix.deprec_sym }}-deprecated-symbols --with-default-api-version=${{ matrix.default_api }} --enable-shared --${{ matrix.parallel }}-parallel --${{ matrix.cpp }}-cxx --${{ matrix.fortran }}-fortran --${{ matrix.java }}-java --${{ matrix.mirror_vfd }}-mirror-vfd --${{ matrix.direct_vfd }}-direct-vfd
+          ${{ matrix.flags }} $GITHUB_WORKSPACE/configure --enable-build-mode=${{ matrix.build_mode.autotools }} --${{ matrix.deprec_sym }}-deprecated-symbols --with-default-api-version=${{ matrix.default_api }} --enable-shared --${{ matrix.parallel }}-parallel --${{ matrix.cpp }}-cxx --${{ matrix.fortran }}-fortran --${{ matrix.java }}-java --${{ matrix.mirror_vfd }}-mirror-vfd --${{ matrix.direct_vfd }}-direct-vfd --with-szlib=${{ matrix.szip }}
         shell: bash
         if: (matrix.generator == 'autogen') && (! matrix.thread_safe.enabled)
 
@@ -404,7 +461,7 @@ jobs:
           sh ./autogen.sh
           mkdir "${{ runner.workspace }}/build"
           cd "${{ runner.workspace }}/build"
-          ${{ matrix.flags }} $GITHUB_WORKSPACE/configure --enable-build-mode=${{ matrix.build_mode.autotools }} --enable-shared --enable-threadsafe --disable-hl --${{ matrix.parallel }}-parallel --${{ matrix.mirror_vfd }}-mirror-vfd --${{ matrix.direct_vfd }}-direct-vfd
+          ${{ matrix.flags }} $GITHUB_WORKSPACE/configure --enable-build-mode=${{ matrix.build_mode.autotools }} --enable-shared --enable-threadsafe --disable-hl --${{ matrix.parallel }}-parallel --${{ matrix.mirror_vfd }}-mirror-vfd --${{ matrix.direct_vfd }}-direct-vfd --with-szlib=${{ matrix.szip }}
         shell: bash
         if: (matrix.generator == 'autogen') && (matrix.thread_safe.enabled)
 
@@ -457,3 +514,17 @@ jobs:
         working-directory: ${{ runner.workspace }}/build
         # Skip Debug MSVC while we investigate H5L Java test timeouts
         if: (matrix.generator != 'autogen') && (matrix.run_tests) && ! ((matrix.name == 'Windows MSVC CMake') && (matrix.build_mode.cmake == 'Debug'))
+
+      #
+      # INSTALL (note that this runs even when we don't run the tests)
+      #
+
+      - name: Autotools Install
+        run: make install
+        working-directory: ${{ runner.workspace }}/build
+        if: (matrix.generator == 'autogen')
+
+      - name: Autotools Verify Install
+        run: make check-install
+        working-directory: ${{ runner.workspace }}/build
+        if: (matrix.generator == 'autogen')