From e4fbc39852e26ebf1937d571c862c4e2e4d294e5 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Wed, 21 Feb 2024 21:59:20 +0100 Subject: [PATCH] .gitlab-ci.yml: use fedora39 for all builds Signed-off-by: Nikos Mavrogiannopoulos --- .gitlab-ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4f0eaf4f..c0fac613 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,6 @@ variables: CENTOS8_BUILD: openconnect-cli-centos8 CENTOS9_BUILD: openconnect-cli-centos9 FEDORA_BUILD: openconnect-cli-fedora39 - FEDORA38_BUILD: openconnect-cli-fedora38 MINGW32_BUILD: openconnect-cli-mingw32 MINGW64_BUILD: openconnect-cli-mingw64 UBUNTU_BUILD: openconnect-cli-ubuntu @@ -110,7 +109,7 @@ Fedora/GnuTLS: Fedora/OpenSSL: stage: test-first - image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA38_BUILD + image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD script: # Re-enable DSA since we test it - update-crypto-policies --set LEGACY @@ -379,7 +378,7 @@ Fedora/GnuTLS/clang: Fedora/OpenSSL/clang: stage: test-rest - image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA38_BUILD + image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD script: # Re-enable DSA since we test it - update-crypto-policies --set LEGACY @@ -530,7 +529,7 @@ ubsan/GnuTLS/Fedora: ubsan/OpenSSL/Fedora: stage: test-sanitizers - image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA38_BUILD + image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD script: - ./autogen.sh - export UBCFLAGS="-Wall -Wextra -fsanitize=undefined -fsanitize=bool -fsanitize=alignment -fsanitize=null -fsanitize=bounds-strict -fsanitize=enum -fno-sanitize-recover -g -O2" @@ -576,7 +575,7 @@ asan/GnuTLS/Fedora: asan/OpenSSL/Fedora: stage: test-sanitizers - image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA38_BUILD + image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD script: - ./autogen.sh - CC=clang CFLAGS="-fsanitize=address -fno-optimize-sibling-calls -fno-omit-frame-pointer -g -O1" -- 2.49.0