Skip to content

Commit 1c55e00

Browse files
authored
Refine mapping of clang/GCC to Ubuntu image versions (#5)
In preparation for removal of the toolchain/test-PPA use images where the compiler is available natively
1 parent 4e662f0 commit 1c55e00

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

ci/drone/functions.star

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -837,8 +837,12 @@ def generate(compiler_ranges, cxx_range, max_cxx=2, coverage=True, docs=True, as
837837
if type == 'docs':
838838
image = 'cppalliance/droneubuntu1804:1'
839839
elif compiler == 'gcc':
840-
if version[0] >= 12:
840+
if version[0] >= 13:
841+
image = 'cppalliance/droneubuntu2404:1'
842+
elif version[0] >= 10:
841843
image = 'cppalliance/droneubuntu2204:1'
844+
elif version[0] >= 7:
845+
image = 'cppalliance/droneubuntu2004:1'
842846
elif version[0] >= 5:
843847
image = 'cppalliance/droneubuntu1804:1'
844848
else:
@@ -848,9 +852,11 @@ def generate(compiler_ranges, cxx_range, max_cxx=2, coverage=True, docs=True, as
848852
elif compiler in ['arm64-gcc', 'arm64-clang']:
849853
image = 'cppalliance/droneubuntu2004:multiarch'
850854
elif compiler == 'clang':
851-
if version[0] >= 13:
855+
if version[0] >= 16:
856+
image = 'cppalliance/droneubuntu2404:1'
857+
elif version[0] >= 11:
852858
image = 'cppalliance/droneubuntu2204:1'
853-
elif version[0] >= 10:
859+
elif version[0] >= 6:
854860
image = 'cppalliance/droneubuntu2004:1'
855861
elif version[0] >= 4:
856862
image = 'cppalliance/droneubuntu1804:1'

0 commit comments

Comments
 (0)