Skip to content

Commit 32c3e92

Browse files
committed
Update CI to run on Ubuntu 22.04 and 24.04
1 parent a2e364e commit 32c3e92

3 files changed

Lines changed: 19 additions & 19 deletions

File tree

.github/workflows/c.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ name: C CI
33
on: [push, pull_request]
44

55
jobs:
6-
ubuntu20:
7-
runs-on: ubuntu-20.04
6+
ubuntu22:
7+
runs-on: ubuntu-22.04
88
env:
99
CC: gcc
1010
CXX: g++
@@ -15,8 +15,8 @@ jobs:
1515
- uses: ./.github/actions/install-ubuntu
1616
- uses: ./.github/actions/build
1717

18-
ubuntu22:
19-
runs-on: ubuntu-22.04
18+
ubuntu24:
19+
runs-on: ubuntu-24.04
2020
env:
2121
CC: gcc
2222
CXX: g++
@@ -27,20 +27,20 @@ jobs:
2727
- uses: ./.github/actions/install-ubuntu
2828
- uses: ./.github/actions/build
2929

30-
ubuntu22-clang:
31-
runs-on: ubuntu-22.04
30+
ubuntu24-clang:
31+
runs-on: ubuntu-24.04
3232
env:
33-
CC: clang-15
34-
CXX: clang++-15
33+
CC: clang-18
34+
CXX: clang++-18
3535
CXXFLAGS: -Werror -Wall -pedantic
3636
BUILD_TYPE: Debug
3737
steps:
3838
- uses: actions/checkout@v4
3939
- uses: ./.github/actions/install-ubuntu
4040
- uses: ./.github/actions/build
4141

42-
ubuntu22-release:
43-
runs-on: ubuntu-22.04
42+
ubuntu24-release:
43+
runs-on: ubuntu-24.04
4444
env:
4545
CC: gcc
4646
CXX: g++

.github/workflows/java.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ name: Java CI
33
on: [push, pull_request]
44

55
jobs:
6-
maven-ubuntu20:
7-
runs-on: ubuntu-20.04
6+
maven-ubuntu22:
7+
runs-on: ubuntu-22.04
88
steps:
99
- uses: actions/checkout@v4
1010
- run: sudo apt-get install protobuf-compiler
@@ -16,8 +16,8 @@ jobs:
1616
- name: Build with Maven
1717
run: mvn -B package --file pom.xml
1818

19-
maven-ubuntu22:
20-
runs-on: ubuntu-22.04
19+
maven-ubuntu24:
20+
runs-on: ubuntu-24.04
2121
steps:
2222
- uses: actions/checkout@v4
2323
- run: sudo apt-get install protobuf-compiler
@@ -29,8 +29,8 @@ jobs:
2929
- name: Build with Maven
3030
run: mvn -B package --file pom.xml
3131

32-
ant-ubuntu20:
33-
runs-on: ubuntu-20.04
32+
ant-ubuntu22:
33+
runs-on: ubuntu-22.04
3434
steps:
3535
- uses: actions/checkout@v4
3636
- run: sudo apt-get install protobuf-compiler libprotobuf-java
@@ -42,8 +42,8 @@ jobs:
4242
- name: Build with Ant
4343
run: ant
4444

45-
ant-ubuntu22:
46-
runs-on: ubuntu-22.04
45+
ant-ubuntu24:
46+
runs-on: ubuntu-24.04
4747
steps:
4848
- uses: actions/checkout@v4
4949
- run: sudo apt-get install protobuf-compiler libprotobuf-java

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.7)
1+
cmake_minimum_required(VERSION 3.10)
22

33
project(osmpbf VERSION 1.5.0)
44

0 commit comments

Comments
 (0)