From 7c992fa09e786a9e861e510a102e38cac07c9d97 Mon Sep 17 00:00:00 2001
From: Daniel Zatovic <daniel.zatovic@gmail.com>
Date: Fri, 12 Jul 2024 17:35:02 +0200
Subject: [PATCH] CI: update Ubuntu container image and set compiler version

---
 .gitlab/ci/cibuild-setup-ubuntu.sh       | 11 +++++++----
 .gitlab/ci/compilation-gcc.gitlab-ci.yml |  3 +--
 .gitlab/ci/gitlab-shared-docker.yml      |  4 +++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.gitlab/ci/cibuild-setup-ubuntu.sh b/.gitlab/ci/cibuild-setup-ubuntu.sh
index 00e37eb92..87d31f790 100755
--- a/.gitlab/ci/cibuild-setup-ubuntu.sh
+++ b/.gitlab/ci/cibuild-setup-ubuntu.sh
@@ -5,7 +5,7 @@ set -ex
 PACKAGES=(
 	git make autoconf automake autopoint pkg-config libtool libtool-bin
 	gettext libssl-dev libdevmapper-dev libpopt-dev uuid-dev libsepol-dev
-	libjson-c-dev libssh-dev libblkid-dev tar libargon2-0-dev libpwquality-dev
+	libjson-c-dev libssh-dev libblkid-dev tar libargon2-dev libpwquality-dev
 	sharutils dmsetup jq xxd expect keyutils netcat-openbsd passwd openssh-client
 	sshpass asciidoctor
 )
@@ -13,9 +13,12 @@ PACKAGES=(
 COMPILER="${COMPILER:?}"
 COMPILER_VERSION="${COMPILER_VERSION:?}"
 
-grep -E '^deb' /etc/apt/sources.list > /etc/apt/sources.list~
-sed -Ei 's/^deb /deb-src /' /etc/apt/sources.list~
-cat /etc/apt/sources.list~ >> /etc/apt/sources.list
+sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.sources
+
+# use this on older Ubuntu
+# grep -E '^deb' /etc/apt/sources.list > /etc/apt/sources.list~
+# sed -Ei 's/^deb /deb-src /' /etc/apt/sources.list~
+# cat /etc/apt/sources.list~ >> /etc/apt/sources.list
 
 apt-get -y update --fix-missing
 DEBIAN_FRONTEND=noninteractive apt-get -yq install software-properties-common wget lsb-release
diff --git a/.gitlab/ci/compilation-gcc.gitlab-ci.yml b/.gitlab/ci/compilation-gcc.gitlab-ci.yml
index 5e9017f4d..3967a4341 100644
--- a/.gitlab/ci/compilation-gcc.gitlab-ci.yml
+++ b/.gitlab/ci/compilation-gcc.gitlab-ci.yml
@@ -23,9 +23,8 @@ test-gcc-fanalyzer:
   extends:
     - .gitlab-shared-gcc
   script:
-    - export CFLAGS="-Wall -Werror -g -O0 -fanalyzer -fdiagnostics-path-format=separate-events"
     - ./autogen.sh
-    - ./configure
+    - ./configure CFLAGS="-Wall -Werror -g -O0 -fanalyzer -fdiagnostics-path-format=separate-events" --host=x86_64
     - make -j
     - make -j check-programs
 
diff --git a/.gitlab/ci/gitlab-shared-docker.yml b/.gitlab/ci/gitlab-shared-docker.yml
index dd42ef7d1..7f72c8388 100644
--- a/.gitlab/ci/gitlab-shared-docker.yml
+++ b/.gitlab/ci/gitlab-shared-docker.yml
@@ -1,5 +1,5 @@
 .gitlab-shared-docker:
-  image: ubuntu:lunar
+  image: ubuntu:noble
   tags:
     - gitlab-org-docker
   stage: test
@@ -19,6 +19,7 @@
   variables:
     COMPILER: "gcc"
     COMPILER_VERSION: "13"
+    CC: "gcc-13"
     RUN_SSH_PLUGIN_TEST: "1"
 
 .gitlab-shared-clang:
@@ -27,4 +28,5 @@
   variables:
     COMPILER: "clang"
     COMPILER_VERSION: "18"
+    CC: "clang-18"
     RUN_SSH_PLUGIN_TEST: "1"