FDS Build: Remove sh to allow bash shell to github linux actions

firemodels · Nov 26, 2024 · dffeb61 · dffeb61
1 parent 1e0d8da
commit dffeb61
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -43,14 +43,12 @@ jobs:
       run: |
         source /opt/intel/oneapi/setvars.sh
         cd ./Build/impi_intel_linux_db
-        bash 
         ./make_fds.sh
         ./fds_impi_intel_linux_db
     - name: build fds release
       run: |
         source /opt/intel/oneapi/setvars.sh
         cd ./Build/impi_intel_linux
-        bash 
         ./make_fds.sh
         ./fds_impi_intel_linux
     # Setup python
@@ -90,13 +88,11 @@ jobs:
       run: |
         source /opt/intel/oneapi/setvars.sh
         cd ./Build/ompi_gnu_linux_db
-        bash 
         ./make_fds.sh
         ./fds_ompi_gnu_linux_db
     - name: build fds release
       run: |
         source /opt/intel/oneapi/setvars.sh
         cd ./Build/ompi_gnu_linux
-        bash 
         ./make_fds.sh
         ./fds_ompi_gnu_linux
diff --git a/Build/Scripts/build_thirdparty_libs.sh b/Build/Scripts/build_thirdparty_libs.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-echo "Current shell: $SHELL"
-
 # Decide compilers
 source ../Scripts/set_compilers.sh
 

diff --git a/Build/impi_intel_linux_db/make_fds.sh b/Build/impi_intel_linux_db/make_fds.sh
@@ -5,7 +5,7 @@ target=${dir##*/}
 
 # Compile third-party libraries
 export FDS_BUILD_TARGET=$target
-sh ../Scripts/build_thirdparty_libs.sh "$@"
+source ../Scripts/build_thirdparty_libs.sh "$@"
 
 # Build fds
 echo Building $target