Skip to content

Commit 8a0ddba

Browse files
authored
Merge pull request #81 from bonachea/ci-flang-22
[NO REVIEW] CI: Add flang-22
2 parents 3375c25 + 8cfb9a7 commit 8a0ddba

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,13 @@ jobs:
5656
container: snowstep/llvm:jammy
5757

5858
# https://hub.docker.com/r/phhargrove/llvm-flang/tags
59+
- os: ubuntu-24.04
60+
compiler: flang
61+
version: 22
62+
container: phhargrove/llvm-flang:22.1.0-latest
5963
- os: ubuntu-24.04
6064
compiler: flang
6165
version: 21
62-
network: smp
6366
container: phhargrove/llvm-flang:21.1.0-latest
6467
- os: ubuntu-24.04
6568
compiler: flang
@@ -217,6 +220,7 @@ jobs:
217220
elif test "$FC" = "lfortran" ; then \
218221
echo "FPM_FC=lfortran" >> "$GITHUB_ENV" ; \
219222
echo "FFLAGS=--cpp $FFLAGS" >> "$GITHUB_ENV" ; \
223+
echo "FPM_FLAGS=--profile debug --verbose" >> "$GITHUB_ENV" ; : fpm 0.13 workaround ; \
220224
else \
221225
echo "FPM_FC=gfortran-${COMPILER_VERSION}" >> "$GITHUB_ENV" ; \
222226
echo "FFLAGS=-ffree-line-length-0 $FFLAGS" >> "$GITHUB_ENV" ; \

src/assert_m.F90

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,16 +117,16 @@ pure subroutine assert_always(assertion, description, file, line)
117117
end block
118118
else
119119
location = location // '<unknown>'
120-
endif
121-
endif
120+
end if
121+
end if
122122

123123
#if ASSERT_MULTI_IMAGE
124124
# if ASSERT_PARALLEL_CALLBACKS
125125
if (associated(assert_this_image)) then
126126
me = assert_this_image()
127127
else
128128
me = 0
129-
endif
129+
end if
130130
# else
131131
me = this_image()
132132
# endif
@@ -145,7 +145,7 @@ pure subroutine assert_always(assertion, description, file, line)
145145
call assert_error_stop(message)
146146
else
147147
; ! deliberate fall-thru
148-
endif
148+
end if
149149
#endif
150150
#ifdef __LFORTRAN__
151151
! workaround a defect observed in LFortran 0.54:

0 commit comments

Comments
 (0)