From e598bcafb8bfbd2b7fc62dbe3ae70822bef35a3b Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Tue, 3 Sep 2024 12:53:39 +0200 Subject: [PATCH] cirrus: prebuild use f40 for extra tests This check has a condition on the distro name to only run once, however the prior fedora version doesn't have to exists necessarily as we might have to drop support there due the outdated golang version. The current fedora version should alway exists so this seems safer. Signed-off-by: Paul Holzinger --- contrib/cirrus/prebuild.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/cirrus/prebuild.sh b/contrib/cirrus/prebuild.sh index e475d93442..934d0f8518 100755 --- a/contrib/cirrus/prebuild.sh +++ b/contrib/cirrus/prebuild.sh @@ -43,11 +43,13 @@ get_env_key() { python -c "$script" } -# Only need to check CI-stuffs on a single build-task, there's only ever -# one prior-fedora task so use that one. +# Only need to check CI-stuffs on a single build-task, there's +# generally one latest fedora task so use that one. In some cases +# when we have to drop testing for the prior fedora task we may +# run twice on current fedora but this is not a problem. # Envars all defined by CI config. # shellcheck disable=SC2154 -if [[ "${DISTRO_NV}" == "$PRIOR_FEDORA_NAME" ]]; then +if [[ "${DISTRO_NV}" == "$FEDORA_NAME" ]]; then msg "Checking shell scripts" showrun ooe.sh dnf install -y ShellCheck # small/quick addition showrun shellcheck --format=tty \