File tree Expand file tree Collapse file tree 2 files changed +20
-13
lines changed Expand file tree Collapse file tree 2 files changed +20
-13
lines changed Original file line number Diff line number Diff line change @@ -23,17 +23,21 @@ runs:
23
23
elif ([ "$RUNNER_OS" == "Linux" ] && [[ "${{ inputs.compiler }}" == "nvidia-hpc" ]]); then
24
24
# Get the compiler version and extract the version number
25
25
ccv=$(${{ env.CC }} --version 2>&1 | awk '/nvc/ {print $2}' | cut -d'-' -f1)
26
- elif ([[ "${{ inputs.compiler }}" != "nvidia-hpc" ]]); then
26
+ elif ([[ "${{ inputs.compiler }}" != "nvidia-hpc" ]] && [[ "${{ inputs.compiler }}" != "lfortran" ]] ); then
27
27
ccv=$(${{ env.CC }} --version | head -n 1)
28
28
ccv=$(echo "$ccv" | grep -woE '[0123456789.]+' | head -n 1)
29
29
fi
30
- [[ "$ccv" == ${{ inputs.version }}* ]] && (echo "found ${{ env.CC }} version: $ccv") || (echo "unexpected ${{ env.CC }} version: $ccv"; exit 1)
30
+ if ([[ "${{ inputs.compiler }}" != "lfortran" ]]); then
31
+ [[ "$ccv" == ${{ inputs.version }}* ]] && (echo "found ${{ env.CC }} version: $ccv") || (echo "unexpected ${{ env.CC }} version: $ccv"; exit 1)
32
+ fi
31
33
32
34
- name : Test compile (bash)
33
35
shell : bash
34
36
run : |
35
- ${{ env.CC }} -o hw hw.c
36
- output=$(./hw '2>&1')
37
- [[ "$output" == *"hello world"* ]] && echo "$output" || (echo "Unexpected C program output: $output"; exit 1)
38
- rm hw
37
+ if ([[ "${{ inputs.compiler }}" != "lfortran" ]]); then
38
+ ${{ env.CC }} -o hw hw.c
39
+ output=$(./hw '2>&1')
40
+ [[ "$output" == *"hello world"* ]] && echo "$output" || (echo "Unexpected C program output: $output"; exit 1)
41
+ rm hw
42
+ fi
39
43
Original file line number Diff line number Diff line change @@ -23,17 +23,20 @@ runs:
23
23
elif ([ "$RUNNER_OS" == "Linux" ] && [[ "${{ matrix.toolchain.compiler}}" == "nvidia-hpc" ]]); then
24
24
# Get the compiler version and extract the version number
25
25
cxxv=$(${{ env.CXX }} --version 2>&1 | awk '/nvc++/ {print $2}' | cut -d'-' -f1)
26
- elif ([[ "${{ matrix.toolchain.compiler}}" != "nvidia-hpc" ]]); then
26
+ elif ([[ "${{ matrix.toolchain.compiler}}" != "nvidia-hpc" ]] && [[ "${{ matrix.toolchain.compiler}}" != "lfortran" ]] ); then
27
27
cxxv=$(${{ env.CXX }} --version | head -n 1)
28
28
cxxv=$(echo "$cxxv" | grep -woE '[0123456789.]+' | head -n 1)
29
29
fi
30
- [[ "$cxxv" == ${{ matrix.toolchain.version }}* ]] && (echo "found ${{ env.CXX }} version: $cxxv") || (echo "unexpected ${{ env.CXX }} version: $cxxv"; exit 1)
30
+ if ([[ "${{ matrix.toolchain.compiler}}" != "lfortran" ]]); then
31
+ [[ "$cxxv" == ${{ matrix.toolchain.version }}* ]] && (echo "found ${{ env.CXX }} version: $cxxv") || (echo "unexpected ${{ env.CXX }} version: $cxxv"; exit 1)
32
+ fi
31
33
32
34
- name : Test compile (bash)
33
35
shell : bash
34
36
run : |
35
- ${{ env.CXX }} -o hw hw.cpp
36
- output=$(./hw '2>&1')
37
- [[ "$output" == *"hello world"* ]] && echo "$output" || (echo "Unexpected C++ program output: $output"; exit 1)
38
- rm hw
39
-
37
+ if ([[ "${{ matrix.toolchain.compiler}}" != "lfortran" ]]); then
38
+ ${{ env.CXX }} -o hw hw.cpp
39
+ output=$(./hw '2>&1')
40
+ [[ "$output" == *"hello world"* ]] && echo "$output" || (echo "Unexpected C++ program output: $output"; exit 1)
41
+ rm hw
42
+ fi
You can’t perform that action at this time.
0 commit comments