From 72dcdf00d8ce661fa4cc0b7594d22027984b620d Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Fri, 24 Apr 2026 09:22:09 +0200 Subject: [PATCH] add support ubuntu focal --- CMakeLists.txt | 2 +- builder/Containerfile.template | 10 ++++++++-- builder/builder | 2 +- src/CMakeLists.txt | 2 +- src/time_format.c | 2 +- tests/CMakeLists.txt | 2 +- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 060a6a4..c161fac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.25.1) +cmake_minimum_required(VERSION 3.16.3) set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "build type") diff --git a/builder/Containerfile.template b/builder/Containerfile.template index 34ce729..7895857 100644 --- a/builder/Containerfile.template +++ b/builder/Containerfile.template @@ -1,9 +1,15 @@ FROM $distro RUN apt-get update \ - && apt-get install -y build-essential cmake file \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y \ + build-essential \ + cmake \ + file \ && apt-get clean RUN apt-get update \ - && apt-get install -y libxml2-dev libcmocka-dev cppcheck \ + && apt-get install -y \ + libxml2-dev \ + libcmocka-dev \ + cppcheck \ && apt-get clean COPY run /app/run RUN chmod 755 /app/run diff --git a/builder/builder b/builder/builder index c737594..b737997 100755 --- a/builder/builder +++ b/builder/builder @@ -33,7 +33,7 @@ run_build_container() main() { - local distros="debian:oldstable debian:stable debian:testing ubuntu:latest ubuntu:rolling" + local distros="debian:oldstable debian:stable debian:testing ubuntu:focal ubuntu:latest ubuntu:rolling" mkdir -p build cp builder/run build/run diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b5088f8..0d55422 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.25.1) +cmake_minimum_required(VERSION 3.16.3) project(feierabend VERSION 1.3.19) diff --git a/src/time_format.c b/src/time_format.c index d0c15d6..51d0df0 100644 --- a/src/time_format.c +++ b/src/time_format.c @@ -38,7 +38,7 @@ char* _strdup(const char* str) if (new_str == NULL) return NULL; - strncpy(new_str, str, size); + memcpy(new_str, str, size); return new_str; } diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 4237ae8..c3a24a7 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.25.1) +cmake_minimum_required(VERSION 3.16.3) find_library(CMOCKA cmocka REQUIRED) find_program(CPPCHECK cppcheck REQUIRED) -- 2.47.3