|
24 | 24 | strategy: |
25 | 25 | fail-fast: false |
26 | 26 | 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 ] |
28 | 28 | compiler: [ gfortran ] |
29 | 29 | version: [ 12, 13, 14, 15, 16 ] |
30 | 30 | extra_flags: [ -g ] |
|
73 | 73 | container: snowstep/llvm:jammy |
74 | 74 |
|
75 | 75 | # 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 |
76 | 80 | - os: ubuntu-24.04 |
77 | 81 | compiler: flang |
78 | 82 | version: 22 |
@@ -218,7 +222,7 @@ jobs: |
218 | 222 | sudo apt-get update |
219 | 223 | #sudo apt list -a 'gfortran-*' |
220 | 224 | 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 |
222 | 226 | sudo apt install -y gfortran-${COMPILER_VERSION} |
223 | 227 | else |
224 | 228 | curl -L https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh -o install-homebrew.sh |
@@ -293,18 +297,20 @@ jobs: |
293 | 297 | echo "ERROR_STOP_CODE=${ERROR_STOP_CODE}" >> "$GITHUB_ENV" |
294 | 298 |
|
295 | 299 | - name: Setup FPM |
| 300 | + if: ${{ !(runner.os == 'Linux' && runner.arch == 'ARM64') }} |
296 | 301 | uses: fortran-lang/setup-fpm@main |
297 | 302 | with: |
298 | 303 | github-token: ${{ secrets.GITHUB_TOKEN }} |
299 | 304 | fpm-version: latest |
300 | 305 |
|
301 | 306 | - name: Build FPM |
302 | | - if: false |
| 307 | + if: ${{ runner.os == 'Linux' && runner.arch == 'ARM64' }} |
303 | 308 | 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 |
305 | 311 | 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" |
308 | 314 |
|
309 | 315 | - name: Version info |
310 | 316 | run: | |
|
0 commit comments