Skip to content

Commit 752123e

Browse files
authored
Merge pull request #93 from bonachea/ci-linux-arm
[NO REVIEW] CI: Add coverage for ubuntu-26.04-arm and flang-23rc
2 parents 1eb0cb9 + 9b01be8 commit 752123e

1 file changed

Lines changed: 12 additions & 6 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
os: [ macos-14, macos-15, macos-15-intel, macos-26, macos-26-intel, ubuntu-24.04 ]
27+
os: [ macos-14, macos-15, macos-15-intel, macos-26, macos-26-intel, ubuntu-24.04, ubuntu-26.04-arm ]
2828
compiler: [ gfortran ]
2929
version: [ 12, 13, 14, 15, 16 ]
3030
extra_flags: [ -g ]
@@ -73,6 +73,10 @@ jobs:
7373
container: snowstep/llvm:jammy
7474

7575
# https://hub.docker.com/r/phhargrove/llvm-flang/tags
76+
- os: ubuntu-24.04
77+
compiler: flang
78+
version: 23
79+
container: phhargrove/llvm-flang:23.1.0_rc2-latest
7680
- os: ubuntu-24.04
7781
compiler: flang
7882
version: 22
@@ -218,7 +222,7 @@ jobs:
218222
sudo apt-get update
219223
#sudo apt list -a 'gfortran-*'
220224
sudo apt install -y build-essential
221-
if [[ ${COMPILER_VERSION} -lt 15 ]] ; then
225+
if [[ ${COMPILER_VERSION} -lt 15 ]] || type -p gfortran-${COMPILER_VERSION} ; then
222226
sudo apt install -y gfortran-${COMPILER_VERSION}
223227
else
224228
curl -L https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh -o install-homebrew.sh
@@ -293,18 +297,20 @@ jobs:
293297
echo "ERROR_STOP_CODE=${ERROR_STOP_CODE}" >> "$GITHUB_ENV"
294298
295299
- name: Setup FPM
300+
if: ${{ !(runner.os == 'Linux' && runner.arch == 'ARM64') }}
296301
uses: fortran-lang/setup-fpm@main
297302
with:
298303
github-token: ${{ secrets.GITHUB_TOKEN }}
299304
fpm-version: latest
300305

301306
- name: Build FPM
302-
if: false
307+
if: ${{ runner.os == 'Linux' && runner.arch == 'ARM64' }}
303308
run: |
304-
curl --retry 5 -LOsS https://github.com/fortran-lang/fpm/releases/download/v0.11.0/fpm-0.11.0.F90
309+
export FPM_VERSION=0.13.0
310+
curl --retry 5 -LOsS https://github.com/fortran-lang/fpm/releases/download/v$FPM_VERSION/fpm-$FPM_VERSION.F90
305311
mkdir fpm-temp
306-
gfortran-14 -o fpm-temp/fpm fpm-0.11.0.F90
307-
echo "PATH=`pwd`/fpm-temp:${PATH}" >> "$GITHUB_ENV"
312+
gfortran-14 -o fpm-temp/fpm fpm-$FPM_VERSION.F90
313+
echo "PATH=${PWD}/fpm-temp:${PATH}" >> "$GITHUB_ENV"
308314
309315
- name: Version info
310316
run: |

0 commit comments

Comments
 (0)