Skip to content

Commit fc0128b

Browse files
committed
Github actions: Modernize CI
1 parent dd9badc commit fc0128b

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

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

+1
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
libgdal-dev \
1112
libgeos-dev \
1213
pandoc \

.github/workflows/ci.yml

+6-13
Original file line numberDiff line numberDiff line change
@@ -185,19 +185,12 @@ jobs:
185185
- uses: ./.github/actions/ctest
186186

187187
ubuntu-latest:
188-
runs-on: ubuntu-22.04
188+
runs-on: ubuntu-24.04
189189
env:
190-
CC: clang-15
191-
CXX: clang++-15
190+
CC: clang-18
191+
CXX: clang++-18
192192
BUILD_TYPE: Dev
193193
steps:
194-
- name: Install new clang
195-
run: |
196-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/llvm-snapshot.asc
197-
sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main'
198-
sudo apt-get update -qq
199-
sudo apt-get install -yq clang-15
200-
shell: bash
201194
- uses: actions/checkout@v4
202195
- uses: ./.github/actions/install-ubuntu
203196
- uses: ./.github/actions/cmake
@@ -209,11 +202,11 @@ jobs:
209202
fail-fast: false
210203
matrix:
211204
os:
212-
- "macos-12"
213-
- "macos-13"
205+
- "macos-14"
206+
- "macos-15"
214207
build_type: [Dev]
215208
include:
216-
- os: "macos-12"
209+
- os: "macos-14"
217210
build_type: Release
218211
runs-on: ${{ matrix.os }}
219212
env:

0 commit comments

Comments
 (0)