From 4668b6fd218e3caed87aa8da77bc0e2babd3be7c Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Thu, 19 Dec 2024 15:26:19 +0100 Subject: [PATCH] Refine mapping of clang/GCC to Ubuntu image versions In preparation for removal of the toolchain/test-PPA use images where the compiler is available natively --- ci/drone/functions.star | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ci/drone/functions.star b/ci/drone/functions.star index 743c1ea..cc4720a 100644 --- a/ci/drone/functions.star +++ b/ci/drone/functions.star @@ -837,8 +837,12 @@ def generate(compiler_ranges, cxx_range, max_cxx=2, coverage=True, docs=True, as if type == 'docs': image = 'cppalliance/droneubuntu1804:1' elif compiler == 'gcc': - if version[0] >= 12: + if version[0] >= 13: + image = 'cppalliance/droneubuntu2404:1' + elif version[0] >= 10: image = 'cppalliance/droneubuntu2204:1' + elif version[0] >= 7: + image = 'cppalliance/droneubuntu2004:1' elif version[0] >= 5: image = 'cppalliance/droneubuntu1804:1' else: @@ -848,9 +852,11 @@ def generate(compiler_ranges, cxx_range, max_cxx=2, coverage=True, docs=True, as elif compiler in ['arm64-gcc', 'arm64-clang']: image = 'cppalliance/droneubuntu2004:multiarch' elif compiler == 'clang': - if version[0] >= 13: + if version[0] >= 16: + image = 'cppalliance/droneubuntu2404:1' + elif version[0] >= 11: image = 'cppalliance/droneubuntu2204:1' - elif version[0] >= 10: + elif version[0] >= 6: image = 'cppalliance/droneubuntu2004:1' elif version[0] >= 4: image = 'cppalliance/droneubuntu1804:1'