Skip to content

Commit d7086bd

Browse files
committed
Github action: Cleanup CI workflow
1 parent 5066a95 commit d7086bd

File tree

1 file changed

+21
-22
lines changed

1 file changed

+21
-22
lines changed

.github/workflows/ci.yml

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@ jobs:
1818
- "debian:bookworm" # gcc 12.2.0, clang 15.0.6, cmake 3.25.1
1919
- "debian:testing"
2020
- "debian:experimental"
21-
- "fedora:37" # gcc 12.3.1, clang 15.0.7, cmake 3.26.4
22-
- "fedora:38" # gcc 13.0.1, clang 16.0.5, cmake 3.26.4
2321
- "fedora:39"
2422
- "fedora:40"
23+
- "fedora:41"
2524
build_type: [Dev]
2625
cpp_compiler: [g++]
2726
cpp_version: [c++14]
@@ -77,15 +76,14 @@ jobs:
7776
- image: "debian:experimental"
7877
c_compiler: clang
7978
cpp_compiler: clang++
80-
- image: "fedora:37"
81-
CXXFLAGS: -Wno-stringop-overread -Wno-array-bounds
82-
- image: "fedora:38"
83-
CXXFLAGS: -Wno-stringop-overread -Wno-array-bounds
8479
- image: "fedora:39"
8580
CXXFLAGS: -Wno-stringop-overread -Wno-array-bounds
8681
- image: "fedora:40"
8782
CMAKE_OPTS: -DRUN_TESTS_WITH_BINARY_COMPARE=OFF
8883
CXXFLAGS: -Wno-stringop-overread -Wno-array-bounds
84+
- image: "fedora:41"
85+
CMAKE_OPTS: -DRUN_TESTS_WITH_BINARY_COMPARE=OFF
86+
CXXFLAGS: -Wno-stringop-overread -Wno-array-bounds
8987
container:
9088
image: ${{ matrix.image }}
9189
env:
@@ -127,17 +125,17 @@ jobs:
127125
if: startsWith(matrix.image, 'fedora:')
128126
run: |
129127
dnf install --quiet --assumeyes \
130-
boost-devel \
131-
bzip2-devel \
132-
cmake \
133-
expat-devel \
134-
gcc-c++ \
135-
git \
136-
json-devel \
137-
lz4-devel \
138-
make \
139-
pandoc \
140-
zlib-devel
128+
boost-devel \
129+
bzip2-devel \
130+
cmake \
131+
expat-devel \
132+
gcc-c++ \
133+
git \
134+
json-devel \
135+
lz4-devel \
136+
make \
137+
pandoc \
138+
zlib-devel
141139
- uses: actions/checkout@v4
142140
- uses: ./.github/actions/install-from-git
143141
- uses: ./.github/actions/cmake
@@ -146,6 +144,7 @@ jobs:
146144

147145
ubuntu-latest:
148146
runs-on: ubuntu-24.04
147+
timeout-minutes: 30
149148
env:
150149
CC: clang-18
151150
CXX: clang++-18
@@ -159,18 +158,18 @@ jobs:
159158
- uses: ./.github/actions/ctest
160159

161160
macos:
161+
runs-on: ${{ matrix.os }}
162162
timeout-minutes: 30
163163
strategy:
164164
fail-fast: false
165165
matrix:
166166
os:
167-
- "macos-14"
168-
- "macos-15"
167+
- macos-14
168+
- macos-15
169169
build_type: [Dev]
170170
include:
171-
- os: "macos-14"
171+
- os: macos-14
172172
build_type: Release
173-
runs-on: ${{ matrix.os }}
174173
env:
175174
CC: clang
176175
CXX: clang++
@@ -184,14 +183,14 @@ jobs:
184183
- uses: ./.github/actions/ctest
185184

186185
windows:
186+
runs-on: ${{ matrix.os }}
187187
timeout-minutes: 30
188188
strategy:
189189
fail-fast: false
190190
matrix:
191191
os:
192192
- windows-2019
193193
- windows-2022
194-
runs-on: ${{ matrix.os }}
195194
steps:
196195
- run: |
197196
vcpkg install \

0 commit comments

Comments
 (0)