Fix dependencies issue

jhendersonHDF · Oct 30, 2024 · eaecb05 · eaecb05
1 parent cf0fe62
commit eaecb05
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 11 deletions.
diff --git a/.github/workflows/build_mpich_source.yml b/.github/workflows/build_mpich_source.yml
@@ -8,7 +8,7 @@ on:
   workflow_call:
     inputs:
       build_mode:
-        description: "production vs. debug build"
+        description: "Release vs. Debug build"
         required: true
         type: string
 
@@ -54,8 +54,8 @@ jobs:
 
       # Enable threads=multiple for testing with Subfiling and
       # VOL connectors that require MPI_THREAD_MULTIPLE
-      - name: Install MPICH (GCC) (Production)
-        if: ${{ steps.cache-mpich-ubuntu-gcc.cache-hit != 'true' && (inputs.build_mode != 'debug') }}
+      - name: Install MPICH (GCC) (Release)
+        if: ${{ steps.cache-mpich-ubuntu-gcc.cache-hit != 'true' && (inputs.build_mode == 'Release') }}
         run: |
           cd $GITHUB_WORKSPACE/mpich
           ./autogen.sh
@@ -69,7 +69,7 @@ jobs:
       # Enable threads=multiple for testing with Subfiling and
       # VOL connectors that require MPI_THREAD_MULTIPLE
       - name: Install MPICH (GCC) (Debug)
-        if: ${{ steps.cache-mpich-ubuntu-gcc.cache-hit != 'true' && (inputs.build_mode == 'debug') }}
+        if: ${{ steps.cache-mpich-ubuntu-gcc.cache-hit != 'true' && (inputs.build_mode == 'Debug') }}
         run: |
           cd $GITHUB_WORKSPACE/mpich
           ./autogen.sh

diff --git a/.github/workflows/build_openmpi_source.yml b/.github/workflows/build_openmpi_source.yml
@@ -8,7 +8,7 @@ on:
   workflow_call:
     inputs:
       build_mode:
-        description: "production vs. debug build"
+        description: "Release vs. Debug build"
         required: true
         type: string
 
@@ -52,8 +52,8 @@ jobs:
           path: ${{ runner.workspace }}/openmpi
           key: ${{ runner.os }}-${{ runner.arch }}-gcc-openmpi-${{ steps.get-sha.outputs.sha }}-${{ inputs.build_mode }}
 
-      - name: Install OpenMPI (GCC) (Production)
-        if: ${{ steps.cache-openmpi-ubuntu-gcc.cache-hit != 'true' && (inputs.build_mode != 'debug') }}
+      - name: Install OpenMPI (GCC) (Release)
+        if: ${{ steps.cache-openmpi-ubuntu-gcc.cache-hit != 'true' && (inputs.build_mode = 'Release') }}
         run: |
           cd $GITHUB_WORKSPACE/ompi
           ./autogen.pl
@@ -64,7 +64,7 @@ jobs:
           make install
 
       - name: Install OpenMPI (GCC) (Debug)
-        if: ${{ steps.cache-openmpi-ubuntu-gcc.cache-hit != 'true' && (inputs.build_mode == 'debug') }}
+        if: ${{ steps.cache-openmpi-ubuntu-gcc.cache-hit != 'true' && (inputs.build_mode == 'Debug') }}
         run: |
           cd $GITHUB_WORKSPACE/ompi
           ./autogen.pl

diff --git a/.github/workflows/cmake-par-source.yml b/.github/workflows/cmake-par-source.yml
@@ -44,7 +44,13 @@ jobs:
     name: "Parallel OpenMPI GCC-${{ inputs.build_mode }}"
     runs-on: ubuntu-latest
     steps:
-      - name: Get OpenMPI installation
+      - name: Install Linux Dependencies (OpenMPI)
+        run: |
+          sudo apt-get update
+          sudo apt-get install ninja-build
+          sudo apt install libaec0 libaec-dev
+
+      - name: Get MPI installation (OpenMPI)
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
           name: openmpi
@@ -58,7 +64,7 @@ jobs:
           echo "CC=${{ runner.workspace }}/openmpi/bin/mpicc" >> $GITHUB_ENV
           echo "FC=${{ runner.workspace }}/openmpi/bin/mpif90" >> $GITHUB_ENV
 
-      - name: Install Dependencies
+      - name: Install Doxygen
         uses: ssciwr/doxygen-install@v1
         with:
           version: "1.9.7"
@@ -150,6 +156,12 @@ jobs:
     steps:
       - uses: actions/[email protected]
 
+      - name: Install Linux Dependencies (MPICH)
+        run: |
+          sudo apt-get update
+          sudo apt-get install ninja-build
+          sudo apt install libaec0 libaec-dev
+
       - name: Get MPICH installation
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
@@ -164,7 +176,7 @@ jobs:
           echo "CC=${{ runner.workspace }}/mpich/bin/mpicc" >> $GITHUB_ENV
           echo "FC=${{ runner.workspace }}/mpich/bin/mpif90" >> $GITHUB_ENV
 
-      - name: Install Dependencies
+      - name: Install Doxygen
         uses: ssciwr/doxygen-install@v1
         with:
           version: "1.9.7"