Skip to content

Commit 24efe40

Browse files
committed
CI: GCC 9, 10 install
actions/runner-images#12898
1 parent b2ca364 commit 24efe40

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ jobs:
3939
FC: gfortran-${{ matrix.gcc-version }}
4040

4141
steps:
42-
- uses: actions/checkout@v4
42+
- &checkout
43+
uses: actions/checkout@v5
4344

4445
- uses: ./.github/workflows/composite-unix
4546

@@ -58,7 +59,13 @@ jobs:
5859
FC: gfortran-${{ matrix.gcc-version }}
5960

6061
steps:
61-
- uses: actions/checkout@v4
62+
- *checkout
63+
64+
- name: GCC APT
65+
if: matrix.gcc-version < 11
66+
run: |
67+
sudo apt update -y
68+
sudo apt install -y --no-install-recommends gcc-${{ matrix.gcc-version }} g++-${{ matrix.gcc-version }} gfortran-${{ matrix.gcc-version }}
6269
6370
- uses: ./.github/workflows/composite-unix
6471

@@ -74,7 +81,7 @@ jobs:
7481
sudo apt update
7582
sudo apt install --no-install-recommends valgrind
7683
77-
- uses: actions/checkout@v4
84+
- *checkout
7885

7986
- run: ctest -S memcheck.cmake -VV -E "sleep|string_array|string_view|binding_derived"
8087

@@ -93,7 +100,7 @@ jobs:
93100
FC: flang-${{ matrix.llvm-version }}
94101

95102
steps:
96-
- uses: actions/checkout@v4
103+
- *checkout
97104

98105
- name: Apt LLVM
99106
run: |
@@ -116,7 +123,7 @@ jobs:
116123
strategy:
117124
matrix:
118125
compiler: [{cpp: clang++, c: clang, fc: flang-new },
119-
{cpp: g++-14, c: gcc-14, fc: gfortran-14 }]
126+
{cpp: g++-15, c: gcc-15, fc: gfortran-15 }]
120127

121128
env:
122129
FC: ${{ matrix.compiler.fc }}
@@ -128,7 +135,7 @@ jobs:
128135
if: ${{ matrix.compiler.fc == 'flang-new' }}
129136
run: brew install flang
130137

131-
- uses: actions/checkout@v4
138+
- *checkout
132139

133140
- uses: ./.github/workflows/composite-unix
134141

@@ -147,11 +154,11 @@ jobs:
147154
- name: Put MSYS2_MinGW64 on PATH
148155
run: echo "${{ steps.msys2.outputs.msys2-location }}/ucrt64/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
149156

150-
- uses: actions/checkout@v4
157+
- *checkout
151158

152-
- run: cmake --workflow --preset default
159+
- run: cmake --workflow default
153160
env:
154-
CMAKE_GENERATOR: "MinGW Makefiles"
161+
CMAKE_GENERATOR: Ninja
155162

156163
- name: upload CMakeConfigureLog.yaml
157164
if: failure() && hashFiles('build/CMakeFiles/CMakeConfigureLog.yaml') != ''

0 commit comments

Comments
 (0)