From 0f56cc9a4ee61fa779796db6e8858a7db7b659ec Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Tue, 23 Apr 2024 13:58:50 -0400
Subject: [PATCH] ci: update Linux image to Fedora 40

Drop ROCm HIP packages from the image in favor of the dedicated
Fedora 39 base image we use for that job.

Issue: #25932
---
 .gitlab/ci/docker/{fedora39 => fedora40}/Dockerfile |  2 +-
 .../docker/{fedora39 => fedora40}/deps_packages.lst | 13 +++++--------
 .../docker/{fedora39 => fedora40}/install_deps.sh   |  0
 .../docker/{fedora39 => fedora40}/install_iwyu.sh   | 10 +++++-----
 .../ci/docker/{fedora39 => fedora40}/install_rvm.sh |  0
 .../docker/{fedora39 => fedora40}/iwyu_packages.lst |  0
 .../docker/{fedora39 => fedora40}/rvm_packages.lst  |  0
 7 files changed, 11 insertions(+), 14 deletions(-)
 rename .gitlab/ci/docker/{fedora39 => fedora40}/Dockerfile (98%)
 rename .gitlab/ci/docker/{fedora39 => fedora40}/deps_packages.lst (93%)
 rename .gitlab/ci/docker/{fedora39 => fedora40}/install_deps.sh (100%)
 rename .gitlab/ci/docker/{fedora39 => fedora40}/install_iwyu.sh (77%)
 rename .gitlab/ci/docker/{fedora39 => fedora40}/install_rvm.sh (100%)
 rename .gitlab/ci/docker/{fedora39 => fedora40}/iwyu_packages.lst (100%)
 rename .gitlab/ci/docker/{fedora39 => fedora40}/rvm_packages.lst (100%)

diff --git a/.gitlab/ci/docker/fedora39/Dockerfile b/.gitlab/ci/docker/fedora40/Dockerfile
similarity index 98%
rename from .gitlab/ci/docker/fedora39/Dockerfile
rename to .gitlab/ci/docker/fedora40/Dockerfile
index f14e017ae3..896456c84b 100644
--- a/.gitlab/ci/docker/fedora39/Dockerfile
+++ b/.gitlab/ci/docker/fedora40/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG BASE_IMAGE=fedora:39
+ARG BASE_IMAGE=fedora:40
 
 FROM ${BASE_IMAGE} AS dnf-cache
 # Populate DNF cache w/ the fresh metadata and prefetch packages.
diff --git a/.gitlab/ci/docker/fedora39/deps_packages.lst b/.gitlab/ci/docker/fedora40/deps_packages.lst
similarity index 93%
rename from .gitlab/ci/docker/fedora39/deps_packages.lst
rename to .gitlab/ci/docker/fedora40/deps_packages.lst
index 1459894e94..c7bad7cf20 100644
--- a/.gitlab/ci/docker/fedora39/deps_packages.lst
+++ b/.gitlab/ci/docker/fedora40/deps_packages.lst
@@ -11,7 +11,6 @@ clang-tools-extra
 clang-tools-extra-devel
 compiler-rt
 flang
-flang-devel
 gcc-c++
 git-core
 llvm-devel
@@ -32,6 +31,7 @@ zlib-devel
 
 # Install documentation tools.
 python3-sphinx
+python3-sphinxcontrib-qthelp
 texinfo
 qt5-qttools-devel
 qt6-qttools-devel
@@ -49,13 +49,6 @@ which
 # Install ASM_NASM language toolchain.
 nasm
 
-# Install HIP language toolchain.
-hsakmt-devel
-lld
-rocm-comgr-devel
-rocm-hip-devel
-rocm-runtime-devel
-
 # Packages needed to test CTest.
 breezy
 subversion
@@ -99,6 +92,7 @@ libcurl-devel
 libicu-devel
 libinput-devel systemd-devel
 libjpeg-turbo-devel
+libomp-devel
 libpng-devel
 opensp-devel
 postgresql-server-devel
@@ -126,3 +120,6 @@ wxGTK-devel
 xalan-c-devel
 xerces-c-devel
 xz-devel
+
+# Packages needed to test third-party binaries.
+ncurses-compat-libs
diff --git a/.gitlab/ci/docker/fedora39/install_deps.sh b/.gitlab/ci/docker/fedora40/install_deps.sh
similarity index 100%
rename from .gitlab/ci/docker/fedora39/install_deps.sh
rename to .gitlab/ci/docker/fedora40/install_deps.sh
diff --git a/.gitlab/ci/docker/fedora39/install_iwyu.sh b/.gitlab/ci/docker/fedora40/install_iwyu.sh
similarity index 77%
rename from .gitlab/ci/docker/fedora39/install_iwyu.sh
rename to .gitlab/ci/docker/fedora40/install_iwyu.sh
index 684e355058..50ed612789 100755
--- a/.gitlab/ci/docker/fedora39/install_iwyu.sh
+++ b/.gitlab/ci/docker/fedora40/install_iwyu.sh
@@ -18,13 +18,13 @@ readonly llvm_version="$( echo "$llvm_full_version" | cut -d. -f-1 )"
 git checkout "clang_$llvm_version"
 git apply <<EOF
 diff --git a/iwyu_driver.cc b/iwyu_driver.cc
-index 42fea35..fbb77a9 100644
+index dd4b046..cfd568a 100644
 --- a/iwyu_driver.cc
 +++ b/iwyu_driver.cc
-@@ -167,6 +167,7 @@ CompilerInstance* CreateCompilerInstance(int argc, const char **argv) {
-   DiagnosticsEngine diagnostics(diagnostic_id, &*diagnostic_options,
-                                 diagnostic_client);
-   Driver driver(path, getDefaultTargetTriple(), diagnostics);
+@@ -249,6 +249,7 @@ bool ExecuteAction(int argc, const char** argv,
+                                           /*CodeGenOpts=*/nullptr);
+
+   Driver driver(path, getDefaultTargetTriple(), *diagnostics);
 +  driver.ResourceDir = "/usr/lib64/clang/$llvm_full_version";
    driver.setTitle("include what you use");
 
diff --git a/.gitlab/ci/docker/fedora39/install_rvm.sh b/.gitlab/ci/docker/fedora40/install_rvm.sh
similarity index 100%
rename from .gitlab/ci/docker/fedora39/install_rvm.sh
rename to .gitlab/ci/docker/fedora40/install_rvm.sh
diff --git a/.gitlab/ci/docker/fedora39/iwyu_packages.lst b/.gitlab/ci/docker/fedora40/iwyu_packages.lst
similarity index 100%
rename from .gitlab/ci/docker/fedora39/iwyu_packages.lst
rename to .gitlab/ci/docker/fedora40/iwyu_packages.lst
diff --git a/.gitlab/ci/docker/fedora39/rvm_packages.lst b/.gitlab/ci/docker/fedora40/rvm_packages.lst
similarity index 100%
rename from .gitlab/ci/docker/fedora39/rvm_packages.lst
rename to .gitlab/ci/docker/fedora40/rvm_packages.lst