Skip to content

Commit 3cf51b7

Browse files
authored
Merge pull request #72 from bonachea/ci-gfortran-15
[NO REVIEW]: CI: Add GFortran 15 testing on macOS
2 parents d33d6d4 + 6338eb4 commit 3cf51b7

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

.github/workflows/build.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,20 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
os: [macos-13, macos-14, macos-15, ubuntu-22.04, ubuntu-24.04]
16+
os: [macos-13, macos-14, macos-15, ubuntu-24.04]
1717
compiler: [ gfortran ]
18-
version: [ 12, 13, 14 ]
18+
version: [ 12, 13, 14, 15 ]
1919
extra_flags: [ -g ]
2020

2121
exclude:
22-
- os: ubuntu-22.04
23-
version: 13 # no package available
24-
- os: ubuntu-22.04
25-
version: 14 # no package available
22+
- os: ubuntu-24.04
23+
version: 15 # no package available (yet?)
2624

2725
include:
26+
- os: ubuntu-22.04
27+
compiler: gfortran
28+
version: 12 # no package available for gfortran 13+
29+
2830
# --- LLVM flang coverage ---
2931

3032
- os: macos-13
@@ -109,15 +111,13 @@ jobs:
109111
- name: Checkout code
110112
uses: actions/checkout@v4
111113

112-
- name: Install Dependencies Ubuntu
113-
if: ${{ contains(matrix.os, 'ubuntu') && matrix.compiler == 'gfortran' && 0 }}
114+
- name: Install Ubuntu Native Dependencies
115+
if: ${{ contains(matrix.os, 'ubuntu') && matrix.container == '' && matrix.compiler == 'gfortran' }}
114116
run: |
115-
sudo apt-get update
116-
sudo apt list -a 'gfortran-*'
117-
sudo apt install -y gfortran-${COMPILER_VERSION} build-essential
118-
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${COMPILER_VERSION} 100 \
119-
--slave /usr/bin/gfortran gfortran /usr/bin/gfortran-${COMPILER_VERSION}
120-
117+
set -x
118+
sudo apt update
119+
# sudo apt list -a 'gfortran-*'
120+
sudo apt install -y build-essential gfortran-${COMPILER_VERSION}
121121
122122
- name: Install Ubuntu Container Dependencies
123123
if: ${{ contains(matrix.os, 'ubuntu') && matrix.container != '' && !contains(matrix.container, 'phhargrove') }}

0 commit comments

Comments
 (0)