Skip to content

Commit dffeb61

Browse files
committed
FDS Build: Remove sh to allow bash shell to github linux actions
1 parent 1e0d8da commit dffeb61

File tree

3 files changed

+1
-7
lines changed

3 files changed

+1
-7
lines changed

.github/workflows/linux.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,12 @@ jobs:
4343
run: |
4444
source /opt/intel/oneapi/setvars.sh
4545
cd ./Build/impi_intel_linux_db
46-
bash
4746
./make_fds.sh
4847
./fds_impi_intel_linux_db
4948
- name: build fds release
5049
run: |
5150
source /opt/intel/oneapi/setvars.sh
5251
cd ./Build/impi_intel_linux
53-
bash
5452
./make_fds.sh
5553
./fds_impi_intel_linux
5654
# Setup python
@@ -90,13 +88,11 @@ jobs:
9088
run: |
9189
source /opt/intel/oneapi/setvars.sh
9290
cd ./Build/ompi_gnu_linux_db
93-
bash
9491
./make_fds.sh
9592
./fds_ompi_gnu_linux_db
9693
- name: build fds release
9794
run: |
9895
source /opt/intel/oneapi/setvars.sh
9996
cd ./Build/ompi_gnu_linux
100-
bash
10197
./make_fds.sh
10298
./fds_ompi_gnu_linux

Build/Scripts/build_thirdparty_libs.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#!/bin/bash
22

3-
echo "Current shell: $SHELL"
4-
53
# Decide compilers
64
source ../Scripts/set_compilers.sh
75

Build/impi_intel_linux_db/make_fds.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ target=${dir##*/}
55

66
# Compile third-party libraries
77
export FDS_BUILD_TARGET=$target
8-
sh ../Scripts/build_thirdparty_libs.sh "$@"
8+
source ../Scripts/build_thirdparty_libs.sh "$@"
99

1010
# Build fds
1111
echo Building $target

0 commit comments

Comments
 (0)