Skip to content

Commit 1553c40

Browse files
zarethrexzarethrex
authored
Merge pull request #26 from zarethrex/25-convert-endif-to-end-if-to-support-other-compilers
Use END IF, END DO for F90
2 parents c529fd5 + 7ee466d commit 1553c40

File tree

11 files changed

+170
-134
lines changed

11 files changed

+170
-134
lines changed

‎.github/workflows/futs.yml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
name: FortUTF Ubuntu Gfortran 14
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
branches:
9+
- main
410

511
concurrency:
612
group: ${{ github.workflow }}-${{ github.ref }}
@@ -9,7 +15,7 @@ concurrency:
915
jobs:
1016
build:
1117
name: Ubuntu Latest Tests
12-
runs-on: 'ubuntu-24.04'
18+
runs-on: 'ubuntu-latest'
1319
steps:
1420
- uses: actions/checkout@v4
1521
- name: Setup cmake
@@ -21,7 +27,7 @@ jobs:
2127
- name: Build Tests
2228
run: |
2329
gfortran-14 --version
24-
cmake -H. -Bbuild -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON -DCMAKE_Fortran_COMPILER=$(which gfortran-12)
30+
cmake -H. -Bbuild -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON -DCMAKE_Fortran_COMPILER=$(which gfortran-14)
2531
cmake --build build
2632
- name: Run Tests
2733
run: |
@@ -57,7 +63,7 @@ jobs:
5763
continue-on-error: true
5864
run: |
5965
sudo apt install -y lcov
60-
lcov --gcov-tool $(which gcov) --directory . --capture --output-file temp.info -b src/
66+
lcov --gcov-tool $(which gcov-14) --directory . --capture --output-file temp.info -b src/
6167
lcov --remove temp.info 'tests/*' 'tests/test_assertions/*' -o FortUTF.info
6268
- uses: codecov/codecov-action@v3
6369
continue-on-error: true

‎.github/workflows/futs_flang.yml‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
name: FortUTF Ubuntu LLVM 20
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
branches:
9+
- main
10+
11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.ref }}
13+
cancel-in-progress: true
14+
15+
jobs:
16+
build:
17+
runs-on: 'ubuntu-latest'
18+
steps:
19+
- uses: actions/checkout@v4
20+
- name: Setup cmake
21+
uses: jwlawson/actions-setup-cmake@v2
22+
with:
23+
cmake-version: '4.1.x'
24+
- name: Install LLVM
25+
run: |
26+
wget https://apt.llvm.org/llvm.sh
27+
chmod +x llvm.sh
28+
sudo ./llvm.sh 20
29+
sudo apt-get update
30+
- name: install Flang
31+
run: sudo apt install --no-install-recommends clang-20 flang-20
32+
- name: Build Tests
33+
run: |
34+
flang-20 --version
35+
cmake -H. -Bbuild -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON -DCMAKE_Fortran_COMPILER=$(which flang-20)
36+
cmake --build build
37+
- name: Run Tests
38+
run: |
39+
./build/FortUTF_Tests
40+
if [ $? -eq 0 ]; then
41+
echo "Unit Tests completed successfully"
42+
exit 0
43+
else
44+
echo "Unit Tests failed"
45+
exit 1
46+
fi
47+
- name: Run Test List
48+
run: |
49+
./build/FortUTF_Tests TEST_FAIL_EQUAL_CHAR TEST_EQUAL_CHAR
50+
if [ $? -eq 0 ]; then
51+
echo "Unit Tests completed succesfully"
52+
exit 0
53+
else
54+
echo "Unit Tests failed"
55+
exit 1
56+
fi
57+
- name: Run Example Tests
58+
run: |
59+
./build/examples/demo_project/DEMO_PROJ_Tests ||
60+
if [ $? -eq 1 ]; then
61+
echo "Unit Tests failed as expected"
62+
exit 0
63+
else
64+
echo "Unit Tests that should fail passed"
65+
exit 1
66+
fi
67+

‎.github/workflows/futs_intel.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
name: FortUTF Ubuntu Intel 2025
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
branches:
9+
- main
410

511
concurrency:
612
group: ${{ github.workflow }}-${{ github.ref }}
@@ -9,13 +15,13 @@ concurrency:
915
jobs:
1016
build:
1117
name: Intel Latest Tests
12-
runs-on: 'ubuntu-24.04'
18+
runs-on: 'ubuntu-latest'
1319
steps:
1420
- uses: actions/checkout@v4
1521
- name: Setup cmake
1622
uses: jwlawson/actions-setup-cmake@v2
1723
with:
18-
cmake-version: '3.31.x'
24+
cmake-version: '4.1.x'
1925
- name: Setup Intel ifx compiler
2026
uses: fortran-lang/setup-fortran@v1
2127
id: setup-fortran

‎.github/workflows/futs_lfortran.yml‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎.github/workflows/futs_mac.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1-
name: FortUTF macOS GFortran 13
1+
name: FortUTF macOS GFortran 15
22

3-
on: [push]
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
branches:
9+
- main
410

511
concurrency:
612
group: ${{ github.workflow }}-${{ github.ref }}
@@ -16,12 +22,12 @@ jobs:
1622
- name: Setup cmake
1723
uses: jwlawson/actions-setup-cmake@v2
1824
with:
19-
cmake-version: '3.31.x'
25+
cmake-version: '4.1.x'
2026
- name: Install GFortran macOS
21-
run: brew install gcc@13
27+
run: brew install gcc@15
2228
- name: Build Tests
2329
run: |
24-
cmake -H. -Bbuild -DBUILD_TESTS=ON -DCMAKE_Fortran_COMPILER=$(which gfortran-12)
30+
cmake -H. -Bbuild -DBUILD_TESTS=ON -DCMAKE_Fortran_COMPILER=$(which gfortran-15)
2531
cmake --build build
2632
- name: Run Tests
2733
run: |

‎.github/workflows/futs_windows.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: FortUTF Windows GFortran 13
1+
name: FortUTF Windows GFortran 15
22

33
on: [push]
44

@@ -15,10 +15,10 @@ jobs:
1515
- name: Setup cmake
1616
uses: jwlawson/actions-setup-cmake@v2
1717
with:
18-
cmake-version: '3.31.x'
18+
cmake-version: '4.1.x'
1919
- name: Build and Run Tests
2020
run: |
21-
choco upgrade mingw --version="'13.2.0'" -y
21+
choco upgrade mingw --version="'15.1.0'" -y
2222
choco install -y make
2323
cmake -G "Unix Makefiles" -Bbuild -DBUILD_TESTS=ON
2424
cmake --build build

0 commit comments

Comments
 (0)