From 831ea2ab0ffe77c523244c2da4b99e0b7a80c870 Mon Sep 17 00:00:00 2001 From: Carlos Abalde Date: Thu, 23 May 2024 14:08:38 +0200 Subject: [PATCH] Update to Ubuntu Noble --- .github/workflows/main.yml | 2 +- Dockerfile | 4 ++-- Makefile.am | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a006a90f..7aff6b0c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,7 +6,7 @@ on: jobs: test: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: matrix: diff --git a/Dockerfile b/Dockerfile index ef39787a..d7b91f9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:jammy-20220428 +FROM ubuntu:noble-20240423 ENV DEBIAN_FRONTEND noninteractive @@ -28,7 +28,7 @@ RUN apt update \ libtool \ make \ nano \ - netcat \ + netcat-traditional \ pkg-config \ python3 \ python3-docutils \ diff --git a/Makefile.am b/Makefile.am index e3bd1c19..b5c3501a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,6 +8,7 @@ dist_doc_DATA = README.rst LICENSE CODE_COVERAGE_OUTPUT_DIRECTORY = lcov CODE_COVERAGE_IGNORE_PATTERN = "/usr/*" crc16.c sha1.c +CODE_COVERAGE_LCOV_RMOPTS = --ignore-errors unused CODE_COVERAGE_GENHTML_OPTIONS = --prefix $(abs_top_srcdir) @CODE_COVERAGE_RULES@