Update for workflows

jhendersonHDF · Oct 30, 2024 · 67b1950 · 67b1950
1 parent 3d578ea
commit 67b1950
Showing 1 changed file with 22 additions and 18 deletions.
diff --git a/.github/workflows/cmake-par-source.yml b/.github/workflows/cmake-par-source.yml
@@ -31,16 +31,18 @@ jobs:
     name: "Parallel OpenMPI GCC-${{ inputs.build_mode }}"
     runs-on: ubuntu-latest
     steps:
-      - name: Install CMake Dependencies (OpenMPI)
+      - name: Build MPI (OpenMPI)
+        uses: ./.github/workflows/build_openmpi_source.yml
+        with:
+          build_mode: ${{ inputs.build_mode }}
+
+      - name: Set path (OpenMPI)
+        shell: bash
         run: |
-          sudo apt-get update
-          sudo apt-get install ninja-build graphviz curl
-          sudo apt install libssl3 libssl-dev libcurl4 libcurl4-openssl-dev
-          sudo apt install gcc-12 g++-12 gfortran-12
-          sudo apt install libaec0 libaec-dev
-          sudo apt-get install libopenmpi-dev
-          echo "CC=mpicc" >> $GITHUB_ENV
-          echo "FC=mpif90" >> $GITHUB_ENV
+          echo "${{ runner.workspace }}/openmpi/bin" >> $GITHUB_PATH
+          echo "LD_LIBRARY_PATH=${{ runner.workspace }}/openmpi/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
+          echo "CC=${{ runner.workspace }}/openmpi/bin/mpicc" >> $GITHUB_ENV
+          echo "FC=${{ runner.workspace }}/openmpi/bin/mpif90" >> $GITHUB_ENV
 
       - name: Install Dependencies
         uses: ssciwr/doxygen-install@v1
@@ -133,16 +135,18 @@ jobs:
     steps:
       - uses: actions/checkout@v4.1.7
 
-      - name: Install Linux Dependencies (MPICH)
+      - name: Build MPI (MPICH)
+        uses: ./.github/workflows/build_mpich_source.yml
+        with:
+          build_mode: ${{ inputs.build_mode }}
+
+      - name: Set path (MPICH)
+        shell: bash
         run: |
-          sudo apt-get update
-          sudo apt-get install ninja-build doxygen graphviz
-          sudo apt install libssl3 libssl-dev libcurl4 libcurl4-openssl-dev
-          sudo apt install gcc-12 g++-12 gfortran-12
-          sudo apt install libaec0 libaec-dev
-          sudo apt-get install libmpich-dev
-          echo "CC=mpicc" >> $GITHUB_ENV
-          echo "FC=mpif90" >> $GITHUB_ENV
+          echo "${{ runner.workspace }}/mpich/bin" >> $GITHUB_PATH
+          echo "LD_LIBRARY_PATH=${{ runner.workspace }}/mpich/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
+          echo "CC=${{ runner.workspace }}/mpich/bin/mpicc" >> $GITHUB_ENV
+          echo "FC=${{ runner.workspace }}/mpich/bin/mpif90" >> $GITHUB_ENV
 
       - name: Install Dependencies
         uses: ssciwr/doxygen-install@v1