From: Michael Tremer Date: Mon, 10 Mar 2025 15:28:47 +0000 (+0000) Subject: jenkins: Okay, drop Alma Linux again X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf9f2fa4a0c4a2b922f1525b0abcbcf0b2d29cb1;p=location%2Flibloc.git jenkins: Okay, drop Alma Linux again This thing just seems to be too ancient and does not have packages for Lua. Instead of creating too many if/else blocks to cover this, let's remove it again. As far as I am aware, we don't have any known users on this distribution. Signed-off-by: Michael Tremer --- diff --git a/Jenkinsfile b/Jenkinsfile index 72397c1..4953adf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,6 @@ pipeline { axis { name "DISTRO" values \ - "almalinux:9", \ "archlinux:base-devel", \ "debian:trixie", \ "debian:bookworm", \ @@ -46,8 +45,8 @@ pipeline { if (env.DISTRO.contains("archlinux")) { installBuildDepsArchLinux(env.DISTRO, env.COMPILER) - // Fedora, Alma Linux, etc. - } else if (env.DISTRO.contains("fedora") || env.DISTRO.contains("almalinux")) { + // Fedora, etc. + } else if (env.DISTRO.contains("fedora")) { installBuildDepsRedHat(env.DISTRO, env.COMPILER) // Debian & Ubuntu @@ -452,14 +451,7 @@ pipeline { // Installs everything we need on RHEL/Fedora/etc. def installBuildDepsRedHat(distro, compier) { - // Install basic development tools - if (distro.contains("almalinux:9")) { - sh "dnf group install -y 'Development Tools'" - - // Other distributions - } else { - sh "dnf group install -y development-tools" - } + sh "dnf group install -y development-tools" // Install our own build and runtime dependencies sh """