Add Ubuntu 24.04 to build pipeline (#431)

_And_:
* Do not report coverage with macOS 12
This commit is contained in:
Hummeltech
2024-04-26 10:02:52 -07:00
committed by GitHub
parent e1611fc4ce
commit c3453bc1e1
9 changed files with 23 additions and 13 deletions

View File

@ -27,7 +27,7 @@ jobs:
- "opensuse/leap:15"
- "quay.io/centos/centos:stream8"
- "quay.io/centos/centos:stream9"
- "ubuntu:20.04"
- "ubuntu:22.04"
on_default_branch:
- ${{ contains(github.ref, 'master') || contains(github.ref, 'develop') || contains(github.ref, 'CI') }}
include:
@ -43,16 +43,16 @@ jobs:
build_system: CMake
compiler: GNU
experimental: true
- image: "ubuntu:22.04"
- image: "ubuntu:24.04"
build_system: Autotools
compiler: GNU
- image: "ubuntu:22.04"
- image: "ubuntu:24.04"
build_system: Autotools
compiler: LLVM
- image: "ubuntu:22.04"
- image: "ubuntu:24.04"
build_system: CMake
compiler: GNU
- image: "ubuntu:22.04"
- image: "ubuntu:24.04"
build_system: CMake
compiler: LLVM
exclude:
@ -108,7 +108,7 @@ jobs:
matrix:
image:
- "debian:12"
- "ubuntu:22.04"
- "ubuntu:24.04"
build_system:
- CMake
compiler:
@ -204,6 +204,7 @@ jobs:
with:
genhtml-extra-options: --keep-going --ignore-errors count,inconsistent,range
lcov-extra-options: --keep-going --ignore-errors count,inconsistent,range
if: matrix.os != 'macos-12'
- name: Package `mod_tile`
uses: ./.github/actions/cmake/package

View File

@ -25,8 +25,8 @@ jobs:
- fedora-39
- fedora-40
- opensuse-leap-15
- ubuntu-20.04
- ubuntu-22.04
- ubuntu-24.04
include:
- service-name: debian-unstable
experimental: true

View File

@ -20,6 +20,7 @@ jobs:
- "debian:12"
- "debian:unstable"
- "ubuntu:22.04"
- "ubuntu:24.04"
- "ubuntu:devel"
fail-fast: false
container:

View File

@ -24,6 +24,7 @@ For your convenience, we have provided a Docker-based building and testing metho
- opensuse-tumbleweed _(openSUSE Tumbleweed)_ [[Dockerfile](/docker/opensuse/Dockerfile)]
- ubuntu-20.04 _(Ubuntu 20.04)_ [[Dockerfile](/docker/ubuntu/Dockerfile)]
- ubuntu-22.04 _(Ubuntu 22.04)_ [[Dockerfile](/docker/ubuntu/Dockerfile)]
- ubuntu-24.04 _(Ubuntu 24.04)_ [[Dockerfile](/docker/ubuntu/Dockerfile)]
- ubuntu-devel _(Ubuntu Devel)_ [[Dockerfile](/docker/ubuntu/Dockerfile)]
### Requirements:

View File

@ -243,13 +243,20 @@ services:
args:
libmapnik_version: "3.1"
ubuntu_version: "22.04"
ubuntu-22.04-autotools:
ubuntu-24.04:
<<: *service_defaults
build:
<<: *build_defaults_ubuntu
args:
libmapnik_version: "3.1"
ubuntu_version: "22.04"
ubuntu_version: "24.04"
ubuntu-24.04-autotools:
<<: *service_defaults
build:
<<: *build_defaults_ubuntu
args:
libmapnik_version: "3.1"
ubuntu_version: "24.04"
dockerfile: docker/ubuntu/Dockerfile.autotools
ubuntu-devel:
<<: *service_defaults

View File

@ -1,5 +1,5 @@
# Arguments
ARG fedora_version=38
ARG fedora_version=40
# Builder
FROM fedora:${fedora_version} as builder

View File

@ -1,7 +1,7 @@
# Arguments
ARG libmapnik_version=3.1
ARG runner_additional_packages
ARG ubuntu_version=22.04
ARG ubuntu_version=24.04
# Builder
FROM ubuntu:${ubuntu_version} as builder

View File

@ -1,6 +1,6 @@
# Arguments
ARG libmapnik_version=3.1
ARG ubuntu_version=22.04
ARG ubuntu_version=24.04
# Builder
FROM ubuntu:${ubuntu_version} as builder

View File

@ -6,7 +6,7 @@ Please see our [Continuous Integration script](/.github/workflows/build-and-test
A Docker-based building & testing setup pipeline is also available [here](/docker) for your convenience.
# Ubuntu 20.04/22.04
# Ubuntu 20.04/22.04.24.04
```shell
#!/usr/bin/env bash