Skip to content

Commit 35ced3e

Browse files
committed
Github actions: Modernize CI
1 parent 3d93c45 commit 35ced3e

File tree

2 files changed

+22
-30
lines changed

2 files changed

+22
-30
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ runs:
88
sudo apt-get update -qq
99
sudo apt-get install -yq \
1010
libboost-dev \
11+
libbz2-dev \
1112
libgdal-dev \
1213
libgeos++-dev
1314
shell: bash

.github/workflows/ci.yml

Lines changed: 21 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,11 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
name: [Ubuntu-18, Ubuntu-20, Ubuntu-22, Debian-10, 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-10, 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]
1616
include:
17-
- name: Ubuntu-18
18-
# Uses gcc 7.5.0, clang 6.0.0, cmake 3.10.2
19-
image: "ubuntu:18.04"
20-
ubuntu: 18
2117
- name: Ubuntu-20
2218
# Uses gcc 9.3.0, clang 10.0.0, cmake 3.16.3
2319
image: "ubuntu:20.04"
@@ -27,6 +23,11 @@ jobs:
2723
image: "ubuntu:22.04"
2824
ubuntu: 22
2925
CXXFLAGS: -Wno-stringop-overread
26+
- name: Ubuntu-24
27+
# gcc 14.2.0, clang 18.1.3, cmake 3.28.3
28+
image: "ubuntu:24.04"
29+
ubuntu: 24
30+
CXXFLAGS: -Wno-stringop-overread
3031
- name: Debian-10
3132
# Uses gcc 8.3.0, clang 7.0.1, cmake 3.13.4
3233
image: "debian:buster"
@@ -100,14 +101,6 @@ jobs:
100101
image: "debian:experimental"
101102
c_compiler: clang
102103
cpp_compiler: clang++
103-
- name: Fedora-35
104-
# Uses gcc 11.2.1, clang 12.0.1, cmake 3.20.5
105-
image: "fedora:35"
106-
CXXFLAGS: -Wno-stringop-overread
107-
- name: Fedora-36
108-
# Uses gcc 12.2.0, clang 14.0.5, cmake 3.24.2
109-
image: "fedora:36"
110-
CXXFLAGS: -Wno-stringop-overread
111104
- name: Fedora-37
112105
# Uses gcc 12.3.1, clang 15.0.7, cmake 3.26.4
113106
image: "fedora:37"
@@ -116,6 +109,12 @@ jobs:
116109
# Uses gcc 13.0.1, clang 16.0.5, cmake 3.26.4
117110
image: "fedora:38"
118111
CXXFLAGS: -Wno-stringop-overread
112+
- name: Fedora-39
113+
image: "fedora:39"
114+
CXXFLAGS: -Wno-stringop-overread
115+
- name: Fedora-40
116+
image: "fedora:40"
117+
CXXFLAGS: -Wno-stringop-overread
119118
container:
120119
image: ${{ matrix.image }}
121120
env:
@@ -169,26 +168,19 @@ jobs:
169168
make \
170169
sqlite-devel \
171170
zlib-devel
172-
- uses: actions/checkout@v3
171+
- uses: actions/checkout@v4
173172
- uses: ./.github/actions/install-from-git
174173
- uses: ./.github/actions/cmake
175174
- uses: ./.github/actions/build
176175

177176
ubuntu-latest:
178-
runs-on: ubuntu-22.04
177+
runs-on: ubuntu-24.04
179178
env:
180-
CC: clang-15
181-
CXX: clang++-15
179+
CC: clang-18
180+
CXX: clang++-18
182181
BUILD_TYPE: Dev
183182
steps:
184-
- name: Install new clang
185-
run: |
186-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/llvm-snapshot.asc
187-
sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main'
188-
sudo apt-get update -qq
189-
sudo apt-get install -yq clang-15
190-
shell: bash
191-
- uses: actions/checkout@v3
183+
- uses: actions/checkout@v4
192184
- uses: ./.github/actions/install-ubuntu
193185
- uses: ./.github/actions/install-from-git
194186
- uses: ./.github/actions/cmake
@@ -199,20 +191,19 @@ jobs:
199191
fail-fast: false
200192
matrix:
201193
os:
202-
- "macos-11"
203-
- "macos-12"
204-
- "macos-13"
194+
- "macos-14"
195+
- "macos-15"
205196
build_type: [Dev]
206197
include:
207-
- os: "macos-12"
198+
- os: "macos-14"
208199
build_type: Release
209200
runs-on: ${{ matrix.os }}
210201
env:
211202
CC: clang
212203
CXX: clang++
213204
BUILD_TYPE: ${{ matrix.build_type }}
214205
steps:
215-
- uses: actions/checkout@v3
206+
- uses: actions/checkout@v4
216207
- uses: ./.github/actions/install-macos
217208
- uses: ./.github/actions/install-from-git
218209
- uses: ./.github/actions/cmake

0 commit comments

Comments
 (0)