Skip to content

Commit a92e65b

Browse files
authored
Merge pull request #200 from bonachea/ci-linux-arm
[NO REVIEW] CI: Add coverage for ubuntu-26.04-arm and flang-23rc
2 parents d8f9685 + 4c32955 commit a92e65b

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

.github/workflows/build.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
os: [ macos-14, macos-15, macos-15-intel, macos-26, macos-26-intel, ubuntu-24.04 ]
28+
os: [ macos-14, macos-15, macos-15-intel, macos-26, macos-26-intel, ubuntu-24.04, ubuntu-26.04-arm ]
2929
compiler: [ gfortran ]
3030
version: [ 13, 14, 15, 16 ]
3131
extra_flags: [ -g -O3 ]
@@ -60,6 +60,10 @@ jobs:
6060
container: snowstep/llvm:ubuntu-22.04-latest
6161

6262
# https://hub.docker.com/r/phhargrove/llvm-flang/tags
63+
- os: ubuntu-24.04
64+
compiler: flang
65+
version: 23
66+
container: phhargrove/llvm-flang:23.1.0_rc2-latest
6367
- os: ubuntu-24.04
6468
compiler: flang
6569
version: 22
@@ -162,7 +166,7 @@ jobs:
162166
sudo apt-get update
163167
#sudo apt list -a 'gfortran-*'
164168
sudo apt install -y build-essential
165-
if [[ ${COMPILER_VERSION} -lt 15 ]] ; then
169+
if [[ ${COMPILER_VERSION} -lt 15 ]] || type -p gfortran-${COMPILER_VERSION} ; then
166170
sudo apt install -y gfortran-${COMPILER_VERSION}
167171
else
168172
curl -L https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh -o install-homebrew.sh
@@ -244,15 +248,16 @@ jobs:
244248
fi
245249
246250
- name: Setup FPM
251+
if: ${{ !(runner.os == 'Linux' && runner.arch == 'ARM64') }}
247252
uses: fortran-lang/setup-fpm@main
248253
with:
249254
github-token: ${{ secrets.GITHUB_TOKEN }}
250255
fpm-version: latest
251256

252257
- name: Build FPM
253-
if: false
258+
if: ${{ runner.os == 'Linux' && runner.arch == 'ARM64' }}
254259
run: |
255-
export FPM_VERSION=0.12.0
260+
export FPM_VERSION=0.13.0
256261
curl --retry 5 -LOsS https://github.com/fortran-lang/fpm/releases/download/v$FPM_VERSION/fpm-$FPM_VERSION.F90
257262
mkdir fpm-temp
258263
gfortran-14 -o fpm-temp/fpm fpm-$FPM_VERSION.F90

0 commit comments

Comments
 (0)