use submodules instead of clones in linux workflow (#321)

AMReX-Combustion · Dec 5, 2023 · c8c1cab · c8c1cab
1 parent fed0cb7
commit c8c1cab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 51 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -68,12 +68,6 @@ jobs:
     - name: Repo Dependencies
       run: Utils/CloneDeps.sh
     - name: Build
-      env:
-         AMREX_HOME: ${GITHUB_WORKSPACE}/build/amrex
-         PELE_PHYSICS_HOME: ${GITHUB_WORKSPACE}/build/PelePhysics
-         PELELMEX_HOME: ${GITHUB_WORKSPACE}
-         AMREX_HYDRO_HOME: ${GITHUB_WORKSPACE}/build/AMReX-Hydro
-         SUNDIALS_HOME : ${GITHUB_WORKSPACE}/build/sundials
       working-directory: ./Exec/RegTests/EB_PipeFlow/
       run: |
         make TPL COMP=gnu USE_MPI=TRUE
@@ -97,12 +91,6 @@ jobs:
     - name: Repo Dependencies
       run: Utils/CloneDeps.sh
     - name: Build
-      env:
-         AMREX_HOME: ${GITHUB_WORKSPACE}/build/amrex
-         PELE_PHYSICS_HOME: ${GITHUB_WORKSPACE}/build/PelePhysics
-         PELELMEX_HOME: ${GITHUB_WORKSPACE}
-         AMREX_HYDRO_HOME: ${GITHUB_WORKSPACE}/build/AMReX-Hydro
-         SUNDIALS_HOME : ${GITHUB_WORKSPACE}/build/sundials
       working-directory: ./Exec/RegTests/EB_BackwardStepFlame/
       run: |
         make TPL COMP=gnu USE_MPI=TRUE
@@ -125,12 +113,6 @@ jobs:
     - name: Repo Dependencies
       run: Utils/CloneDeps.sh
     - name: Build
-      env:
-         AMREX_HOME: ${GITHUB_WORKSPACE}/build/amrex
-         PELE_PHYSICS_HOME: ${GITHUB_WORKSPACE}/build/PelePhysics
-         PELELMEX_HOME: ${GITHUB_WORKSPACE}
-         AMREX_HYDRO_HOME: ${GITHUB_WORKSPACE}/build/AMReX-Hydro
-         SUNDIALS_HOME : ${GITHUB_WORKSPACE}/build/sundials
       working-directory: ./Exec/Efield/FlameSheetIons
       run: |
         make TPL COMP=gnu USE_MPI=TRUE
@@ -154,22 +136,12 @@ jobs:
       run: Utils/CloneDeps.sh
     - name: GenerateTurbFile
       env:
-         AMREX_HOME: ${GITHUB_WORKSPACE}/build/amrex
-         PELE_PHYSICS_HOME: ${GITHUB_WORKSPACE}/build/PelePhysics
-         PELELMEX_HOME: ${GITHUB_WORKSPACE}
-         AMREX_HYDRO_HOME: ${GITHUB_WORKSPACE}/build/AMReX-Hydro
-         SUNDIALS_HOME : ${GITHUB_WORKSPACE}/build/sundials
+         AMREX_HOME: ${GITHUB_WORKSPACE}/Submodules/amrex
       working-directory: ./Exec/RegTests/TurbInflow/TurbFileHIT
       run: |
         make -j 2 COMP=gnu
         ./PeleTurb3d.gnu.ex input hit_file=../../HITDecay/hit_ic_4_32.dat input_ncell=32
     - name: Build
-      env:
-         AMREX_HOME: ${GITHUB_WORKSPACE}/build/amrex
-         PELE_PHYSICS_HOME: ${GITHUB_WORKSPACE}/build/PelePhysics
-         PELELMEX_HOME: ${GITHUB_WORKSPACE}
-         AMREX_HYDRO_HOME: ${GITHUB_WORKSPACE}/build/AMReX-Hydro
-         SUNDIALS_HOME : ${GITHUB_WORKSPACE}/build/sundials
       working-directory: ./Exec/RegTests/TurbInflow/
       run: |
         make TPL COMP=gnu USE_MPI=TRUE DEBUG=TRUE
@@ -200,26 +172,19 @@ jobs:
       run: Utils/CloneDeps.sh
     - name: Build AMReX Tools
       env:
-         AMREX_HOME: ${GITHUB_WORKSPACE}/build/amrex
-      working-directory: ./build/amrex/Tools/Plotfile
+         AMREX_HOME: ${GITHUB_WORKSPACE}/Submodules/amrex
+      working-directory: ./Submodules/amrex/Tools/Plotfile
       run: |
         make
     - name: Build PeleLMeX
-      env:
-         AMREX_HOME: ${GITHUB_WORKSPACE}/build/amrex
-         PELE_PHYSICS_HOME: ${GITHUB_WORKSPACE}/build/PelePhysics
-         PELELMEX_HOME: ${GITHUB_WORKSPACE}
-         AMREX_HYDRO_HOME: ${GITHUB_WORKSPACE}/build/AMReX-Hydro
-         SUNDIALS_HOME : ${GITHUB_WORKSPACE}/build/sundials
-         PELEMP_HOME: ${GITHUB_WORKSPACE}/build/PeleMP
       working-directory: ./Exec/RegTests/SprayTest/
       run: |
         make TPL COMP=gnu USE_MPI=TRUE
         make -j 2 COMP=gnu USE_MPI=TRUE
     - name: Run
       working-directory: ./Exec/RegTests/SprayTest/
       run: |
-        cp ${GITHUB_WORKSPACE}/build/amrex/Tools/Plotfile/fcompare.gnu.ex .
+        cp ${GITHUB_WORKSPACE}/Submodules/amrex/Tools/Plotfile/fcompare.gnu.ex .
         sed -i "s/mpiexec -n 1/mpiexec -n 2/g" multiRuns.py
         ./multiRuns.py
         ./compareOutput.py
diff --git a/Utils/CloneDeps.sh b/Utils/CloneDeps.sh
@@ -1,15 +1,5 @@
 #!/usr/bin/env bash
 
 echo "Getting PeleLMeX dependencies - tests ... "
-export PELELM_HOME=${PWD}/..
-mkdir build
-git clone https://github.com/AMReX-Codes/amrex.git build/amrex
-export AMREX_HOME=${PWD}/build/amrex
-git clone -b development https://github.com/AMReX-Combustion/PelePhysics.git build/PelePhysics
-export PELE_PHYSICS_HOME=${PWD}/build/PelePhysics
-git clone https://github.com/AMReX-Codes/AMReX-Hydro.git build/AMReX-Hydro
-export AMREX_HYDRO_HOME=${PWD}/build/AMReX-Hydro
-git clone https://github.com/AMReX-Combustion/PeleMP.git build/PeleMP
-export PELEMP_HOME=${PWD}/build/PeleMP
-git clone https://github.com/LLNL/sundials.git build/sundials
-export SUNDIALS_HOME=${PWD}/build/sundials
+git submodule init
+git submodule update