Skip to content

Commit 22de49c

Browse files
committed
Github actions: Modernize CI
1 parent 65e882d commit 22de49c

File tree

2 files changed

+22
-26
lines changed

2 files changed

+22
-26
lines changed

.github/actions/install-ubuntu/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ runs:
77
run: |
88
sudo apt-get update -qq
99
sudo apt-get install -yq \
10+
libbz2-dev \
1011
libfmt-dev \
1112
libgdal-dev \
1213
libsqlite3-dev

.github/workflows/ci.yml

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
name: [Ubuntu-20, Ubuntu-22, Debian-11, Debian-12, Debian-Testing, Debian-Experimental, Fedora-35, Fedora-36, Fedora-37, Fedora-38]
12+
name: [Ubuntu-20, Ubuntu-22, Ubuntu-24, Debian-11, Debian-12, Debian-Testing, Debian-Experimental, Fedora-37, Fedora-38, Fedora-39, Fedora-40]
1313
build_type: [Dev]
1414
cpp_compiler: [g++]
1515
cpp_version: [c++11]
@@ -23,6 +23,11 @@ jobs:
2323
image: "ubuntu:22.04"
2424
ubuntu: 22
2525
CXXFLAGS: -Wno-stringop-overread
26+
- name: Ubuntu-24
27+
# Uses gcc 14.2.0, clang 18.1.3, cmake 3.28.3
28+
image: "ubuntu:24.04"
29+
ubuntu: 22
30+
CXXFLAGS: -Wno-stringop-overread
2631
- name: Debian-11
2732
# Uses gcc 10.2.1, clang 11.0.1, cmake 3.18.4
2833
image: "debian:bullseye"
@@ -93,14 +98,6 @@ jobs:
9398
image: "debian:experimental"
9499
c_compiler: clang
95100
cpp_compiler: clang++
96-
- name: Fedora-35
97-
# Uses gcc 11.2.1, clang 12.0.1, cmake 3.20.5
98-
image: "fedora:35"
99-
CXXFLAGS: -Wno-stringop-overread
100-
- name: Fedora-36
101-
# Uses gcc 12.2.0, clang 14.0.5, cmake 3.24.2
102-
image: "fedora:36"
103-
CXXFLAGS: -Wno-stringop-overread
104101
- name: Fedora-37
105102
# Uses gcc 12.3.1, clang 15.0.7, cmake 3.26.4
106103
image: "fedora:37"
@@ -109,6 +106,12 @@ jobs:
109106
# Uses gcc 13.0.1, clang 16.0.5, cmake 3.26.4
110107
image: "fedora:38"
111108
CXXFLAGS: -Wno-stringop-overread
109+
- name: Fedora-39
110+
image: "fedora:39"
111+
CXXFLAGS: -Wno-stringop-overread
112+
- name: Fedora-40
113+
image: "fedora:40"
114+
CXXFLAGS: -Wno-stringop-overread
112115
container:
113116
image: ${{ matrix.image }}
114117
env:
@@ -162,27 +165,20 @@ jobs:
162165
make \
163166
sqlite-devel \
164167
zlib-devel
165-
- uses: actions/checkout@v3
168+
- uses: actions/checkout@v4
166169
- uses: ./.github/actions/install-from-git
167170
- uses: ./.github/actions/cmake
168171
- uses: ./.github/actions/build
169172
- uses: ./.github/actions/ctest
170173

171174
ubuntu-latest:
172-
runs-on: ubuntu-22.04
175+
runs-on: ubuntu-24.04
173176
env:
174-
CC: clang-15
175-
CXX: clang++-15
177+
CC: clang-18
178+
CXX: clang++-18
176179
BUILD_TYPE: Dev
177180
steps:
178-
- name: Install new clang
179-
run: |
180-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/llvm-snapshot.asc
181-
sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main'
182-
sudo apt-get update -qq
183-
sudo apt-get install -yq clang-15
184-
shell: bash
185-
- uses: actions/checkout@v3
181+
- uses: actions/checkout@v4
186182
- uses: ./.github/actions/install-ubuntu
187183
- uses: ./.github/actions/install-from-git
188184
- uses: ./.github/actions/cmake
@@ -194,20 +190,19 @@ jobs:
194190
fail-fast: false
195191
matrix:
196192
os:
197-
- "macos-11"
198-
- "macos-12"
199-
- "macos-13"
193+
- "macos-14"
194+
- "macos-15"
200195
build_type: [Dev]
201196
include:
202-
- os: "macos-12"
197+
- os: "macos-14"
203198
build_type: Release
204199
runs-on: ${{ matrix.os }}
205200
env:
206201
CC: clang
207202
CXX: clang++
208203
BUILD_TYPE: ${{ matrix.build_type }}
209204
steps:
210-
- uses: actions/checkout@v3
205+
- uses: actions/checkout@v4
211206
- uses: ./.github/actions/install-macos
212207
- uses: ./.github/actions/install-from-git
213208
- uses: ./.github/actions/cmake

0 commit comments

Comments
 (0)