diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 9dc760c04ac..81ec0093dd1 100644 --- 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 index b253d030912..5b990f5ff06 100755 --- 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 index fe06efc8128..8013c473584 100755 --- 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