From aa15a7736e1aef5eb4342b0d9e24c4710bde123e Mon Sep 17 00:00:00 2001
From: ggutierrez <94693768+ggutierrez-sunbright@users.noreply.github.com>
Date: Mon, 16 Dec 2024 10:33:15 +0100
Subject: [PATCH] Issue 104/support for ubuntu 24 (#143)

* add support for ubuntu 24 and debian 12

* fix caseness for dockerfiles

* add ubuntu 24 and debian 12 jobs to build matrix
---
 .github/docker/Dockerfile.centos-stream9     | 2 +-
 .github/docker/Dockerfile.debian-10          | 2 +-
 .github/docker/Dockerfile.debian-11          | 2 +-
 .github/docker/Dockerfile.debian-12          | 4 ++++
 .github/docker/Dockerfile.ubuntu-20.04       | 2 +-
 .github/docker/Dockerfile.ubuntu-22.04       | 2 +-
 .github/docker/Dockerfile.ubuntu-22.04-clang | 2 +-
 .github/docker/Dockerfile.ubuntu-24.04       | 4 ++++
 .github/workflows/build_matrix.yml           | 2 ++
 9 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 .github/docker/Dockerfile.debian-12
 create mode 100644 .github/docker/Dockerfile.ubuntu-24.04

diff --git a/.github/docker/Dockerfile.centos-stream9 b/.github/docker/Dockerfile.centos-stream9
index 9618458b..f60341cb 100644
--- a/.github/docker/Dockerfile.centos-stream9
+++ b/.github/docker/Dockerfile.centos-stream9
@@ -1,4 +1,4 @@
-FROM quay.io/centos/centos:stream9 as base
+FROM quay.io/centos/centos:stream9 AS base
 
 # Install dependencies
 RUN yum install -y popt-devel gcc-c++ make diffutils
diff --git a/.github/docker/Dockerfile.debian-10 b/.github/docker/Dockerfile.debian-10
index fd63aa36..864ca86c 100644
--- a/.github/docker/Dockerfile.debian-10
+++ b/.github/docker/Dockerfile.debian-10
@@ -1,4 +1,4 @@
-FROM debian:10 as base
+FROM debian:10 AS base
 
 # Install dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends make g++ libpopt-dev libpopt0
diff --git a/.github/docker/Dockerfile.debian-11 b/.github/docker/Dockerfile.debian-11
index b567aef0..35cba825 100644
--- a/.github/docker/Dockerfile.debian-11
+++ b/.github/docker/Dockerfile.debian-11
@@ -1,4 +1,4 @@
-FROM debian:11 as base
+FROM debian:11 AS base
 
 # Install dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends make g++ libpopt-dev libpopt0
diff --git a/.github/docker/Dockerfile.debian-12 b/.github/docker/Dockerfile.debian-12
new file mode 100644
index 00000000..b8b09e5f
--- /dev/null
+++ b/.github/docker/Dockerfile.debian-12
@@ -0,0 +1,4 @@
+FROM debian:12 AS base
+
+# Install dependencies
+RUN apt-get update && apt-get install -y --no-install-recommends make g++ libpopt-dev libpopt0
diff --git a/.github/docker/Dockerfile.ubuntu-20.04 b/.github/docker/Dockerfile.ubuntu-20.04
index 680ea04b..3785af85 100644
--- a/.github/docker/Dockerfile.ubuntu-20.04
+++ b/.github/docker/Dockerfile.ubuntu-20.04
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04 as base
+FROM ubuntu:20.04 AS base
 
 # Install dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends make g++ libpopt-dev libpopt0
diff --git a/.github/docker/Dockerfile.ubuntu-22.04 b/.github/docker/Dockerfile.ubuntu-22.04
index 1ccba1ed..eaa4c2a8 100644
--- a/.github/docker/Dockerfile.ubuntu-22.04
+++ b/.github/docker/Dockerfile.ubuntu-22.04
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04 as base
+FROM ubuntu:24.04 AS base
 
 # Install dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends make g++ libpopt-dev libpopt0
diff --git a/.github/docker/Dockerfile.ubuntu-22.04-clang b/.github/docker/Dockerfile.ubuntu-22.04-clang
index 3a046284..78c0616f 100644
--- a/.github/docker/Dockerfile.ubuntu-22.04-clang
+++ b/.github/docker/Dockerfile.ubuntu-22.04-clang
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04 as base
+FROM ubuntu:22.04 AS base
 
 # Install dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends make clang libpopt-dev libpopt0
diff --git a/.github/docker/Dockerfile.ubuntu-24.04 b/.github/docker/Dockerfile.ubuntu-24.04
new file mode 100644
index 00000000..bd411c93
--- /dev/null
+++ b/.github/docker/Dockerfile.ubuntu-24.04
@@ -0,0 +1,4 @@
+FROM ubuntu:22.04 AS base
+
+# Install dependencies
+RUN apt-get update && apt-get install -y --no-install-recommends make g++ libpopt-dev libpopt0
diff --git a/.github/workflows/build_matrix.yml b/.github/workflows/build_matrix.yml
index 2c538ab2..d1fad9e2 100644
--- a/.github/workflows/build_matrix.yml
+++ b/.github/workflows/build_matrix.yml
@@ -24,8 +24,10 @@ jobs:
       fail-fast: false  # we want all the flows to run, to success or failure
       matrix:
         distribution:
+          - ubuntu-24.04
           - ubuntu-22.04
           - ubuntu-20.04
+          - debian-12
           - debian-11
           - debian-10
           - centos-stream9