Skip to content

Commit f356f13

Browse files
grisumbrasgrisumbras
committed
do not rely on PPA for compiler packages
* Disable the PPA. * Use Ubuntu images where compiler packages are natively available. ** Use either the image where the particular compiler is the default, or ** Use the oldest image where that package is available (and works), or ** If it's only available in a PPA, then do use it.
1 parent 2ffcb95 commit f356f13

1 file changed

Lines changed: 48 additions & 98 deletions

File tree

‎.drone.star‎

Lines changed: 48 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,14 @@
77

88

99
def main(ctx):
10-
globalenv={'B2_CI_VERSION': '1', 'B2_FLAGS': 'warnings=extra warnings-as-errors=on', 'DEPINST': '--reject-cycles'}
11-
with_stdxxfs = { 'B2_LINKFLAGS': '-lstdc++fs', }
12-
cmake_env = { 'CMAKE_VERSION': '3.8.2'}
10+
globalenv={
11+
'B2_CI_VERSION': '1',
12+
'B2_FLAGS': 'warnings=extra warnings-as-errors=on',
13+
'DEPINST': '--reject-cycles',
14+
'UBUNTU_TOOLCHAIN_DISABLE': 'true',
15+
}
16+
with_stdxxfs = {'B2_LINKFLAGS': '-lstdc++fs', }
17+
cmake_env = {'CMAKE_VERSION': '3.8.2'}
1318

1419
return generate(
1520
['gcc >=4.9', 'clang >=3.8', 'msvc >=14.0', 'apple-clang >=13.4'],
@@ -40,18 +45,18 @@ def main(ctx):
4045
},
4146
],
4247
extras=[
43-
{ 'match': {'compiler': 'gcc =9', 'os': 'linux'},
44-
'name': 'GCC 9 CMake superproject',
48+
{ 'match': {'compiler': 'gcc =8', 'os': 'linux'},
49+
'name': 'GCC 8 CMake superproject',
4550
'type': 'cmake-superproject',
4651
'environment': cmake_env,
4752
},
48-
{ 'match': {'compiler': 'gcc =9', 'os': 'linux'},
49-
'name': 'GCC 9 CMake main project',
53+
{ 'match': {'compiler': 'gcc =8', 'os': 'linux'},
54+
'name': 'GCC 8 CMake main project',
5055
'type': 'cmake-mainproject',
5156
'environment': cmake_env,
5257
},
53-
{ 'match': {'compiler': 'gcc =9', 'os': 'linux'},
54-
'name': 'GCC 9 CMake subdirectory',
58+
{ 'match': {'compiler': 'gcc =8', 'os': 'linux'},
59+
'name': 'GCC 8 CMake subdirectory',
5560
'type': 'cmake-subdirectory',
5661
'environment': cmake_env,
5762
},
@@ -415,7 +420,6 @@ _supported_compilers = {
415420
('linux', 'x86_64'): {
416421
'image': 'cppalliance/droneubuntu2604:1',
417422
'packages': ['g++-16', 'binutils-gold'],
418-
'environment': {'UBUNTU_TOOLCHAIN_DISABLE': 'true'},
419423
}
420424
},
421425
},
@@ -425,7 +429,6 @@ _supported_compilers = {
425429
('linux', 'x86_64'): {
426430
'image': 'cppalliance/droneubuntu2604:1',
427431
'packages': ['g++-15', 'binutils-gold'],
428-
'environment': {'UBUNTU_TOOLCHAIN_DISABLE': 'true'},
429432
}
430433
},
431434
},
@@ -471,7 +474,7 @@ _supported_compilers = {
471474
'custom_cpp': { 2026: '2b' },
472475
'platforms': {
473476
('linux', 'x86_64'): {
474-
'image': 'cppalliance/droneubuntu2004:1',
477+
'image': 'cppalliance/droneubuntu2204:1',
475478
'packages': ['g++-11'],
476479
},
477480
('freebsd', 'x86_64'): {
@@ -481,11 +484,11 @@ _supported_compilers = {
481484
},
482485
},
483486
('linux', 'arm64'): {
484-
'image': 'cppalliance/droneubuntu2004:multiarch',
487+
'image': 'cppalliance/droneubuntu2204:multiarch',
485488
'packages': ['g++-11'],
486489
},
487490
('linux', 's390x'): {
488-
'image': 'cppalliance/droneubuntu2004:multiarch',
491+
'image': 'cppalliance/droneubuntu2204:multiarch',
489492
'packages': ['g++-11'],
490493
},
491494
},
@@ -507,7 +510,7 @@ _supported_compilers = {
507510
'custom_cpp': { 2020: '2a' },
508511
'platforms': {
509512
('linux', 'x86_64'): {
510-
'image': 'cppalliance/droneubuntu1804:1',
513+
'image': 'cppalliance/droneubuntu2004:1',
511514
'packages': ['g++-9'],
512515
},
513516
('freebsd', 'x86_64'): {
@@ -563,7 +566,7 @@ _supported_compilers = {
563566
'latest_cpp': 2017,
564567
'platforms': {
565568
('linux', 'x86_64'): {
566-
'image': 'cppalliance/droneubuntu1804:1',
569+
'image': 'cppalliance/droneubuntu1604:1',
567570
'packages': ['g++-5'],
568571
},
569572
},
@@ -582,7 +585,7 @@ _supported_compilers = {
582585
'custom_cpp': { 2014: '1y' },
583586
'platforms': {
584587
('linux', 'x86_64'): {
585-
'image': 'cppalliance/droneubuntu1604:1',
588+
'image': 'cppalliance/droneubuntu1404:1',
586589
'packages': ['g++-4.8'],
587590
},
588591
},
@@ -617,21 +620,17 @@ _supported_compilers = {
617620
'latest_cpp': 2026,
618621
'platforms': {
619622
('linux', 'x86_64'): {
620-
'image': 'cppalliance/droneubuntu2404:1',
623+
'image': 'cppalliance/droneubuntu2604:1',
621624
'packages': ['clang-21'],
622-
'llvm_os': 'noble',
623-
'llvm_ver': '21',
624625
},
625626
},
626627
},
627628
'20': {
628629
'latest_cpp': 2026,
629630
'platforms': {
630631
('linux', 'x86_64'): {
631-
'image': 'cppalliance/droneubuntu2404:1',
632+
'image': 'cppalliance/droneubuntu2604:1',
632633
'packages': ['clang-20'],
633-
'llvm_os': 'noble',
634-
'llvm_ver': '20',
635634
},
636635
},
637636
},
@@ -641,19 +640,15 @@ _supported_compilers = {
641640
('linux', 'x86_64'): {
642641
'image': 'cppalliance/droneubuntu2404:1',
643642
'packages': ['clang-19'],
644-
'llvm_os': 'noble',
645-
'llvm_ver': '19',
646643
},
647644
},
648645
},
649646
'18': {
650647
'latest_cpp': 2026,
651648
'platforms': {
652649
('linux', 'x86_64'): {
653-
'image': 'cppalliance/droneubuntu2404:1',
650+
'image': 'cppalliance/droneubuntu2004:1',
654651
'packages': ['clang-18'],
655-
'llvm_os': 'noble',
656-
'llvm_ver': '18',
657652
},
658653
},
659654
},
@@ -663,8 +658,6 @@ _supported_compilers = {
663658
('linux', 'x86_64'): {
664659
'image': 'cppalliance/droneubuntu2404:1',
665660
'packages': ['clang-17'],
666-
'llvm_os': 'noble',
667-
'llvm_ver': '17',
668661
},
669662
},
670663
},
@@ -673,10 +666,8 @@ _supported_compilers = {
673666
'custom_cpp': { 2023: '2b' },
674667
'platforms': {
675668
('linux', 'x86_64'): {
676-
'image': 'cppalliance/droneubuntu2204:1',
669+
'image': 'cppalliance/droneubuntu2404:1',
677670
'packages': ['clang-16'],
678-
'llvm_os': 'jammy',
679-
'llvm_ver': '16',
680671
},
681672
},
682673
},
@@ -686,13 +677,9 @@ _supported_compilers = {
686677
'platforms': {
687678
('linux', 'x86_64'): {
688679
'image': 'cppalliance/droneubuntu2204:1',
689-
'packages': ['clang-15', 'libstdc++-10-dev'],
690-
'llvm_os': 'jammy',
691-
'llvm_ver': '15',
692-
},
693-
('freebsd', 'x86_64'): {
694-
'os_version': '13.1',
680+
'packages': ['clang-15'],
695681
},
682+
('freebsd', 'x86_64'): {'os_version': '13.1'},
696683
},
697684
},
698685
'14': {
@@ -701,82 +688,58 @@ _supported_compilers = {
701688
'platforms': {
702689
('linux', 'x86_64'): {
703690
'image': 'cppalliance/droneubuntu2204:1',
704-
'packages': ['clang-14', 'libstdc++-10-dev'],
705-
'llvm_os': 'jammy',
706-
'llvm_ver': "14",
707-
},
708-
('freebsd', 'x86_64'): {
709-
'os_version': '13.1',
691+
'packages': ['clang-14'],
710692
},
711693
('linux', 's390x'): {
712694
'image': 'cppalliance/droneubuntu2204:multiarch',
713-
'packages': ['clang-14', 'libstdc++-10-dev'],
714-
'llvm_os': 'jammy',
715-
'llvm_ver': "14",
695+
'packages': ['clang-14'],
716696
},
697+
('freebsd', 'x86_64'): {'os_version': '13.1'},
717698
},
718699
},
719700
'13': {
720701
'latest_cpp': 2020,
721702
'platforms': {
722703
('linux', 'x86_64'): {
723704
'image': 'cppalliance/droneubuntu2204:1',
724-
'packages': ['clang-13', 'libstdc++-10-dev'],
725-
'llvm_os': 'jammy',
726-
'llvm_ver': '13',
727-
},
728-
('freebsd', 'x86_64'): {
729-
'os_version': '13.1',
705+
'packages': ['clang-13'],
730706
},
707+
('freebsd', 'x86_64'): {'os_version': '13.1'},
731708
},
732709
},
733710
'12': {
734711
'latest_cpp': 2023,
735712
'custom_cpp': { 2023: '2b' },
736713
'platforms': {
737714
('linux', 'x86_64'): {
738-
'image': 'cppalliance/droneubuntu2204:1',
739-
'packages': ['clang-12', 'libstdc++-9-dev'],
740-
'llvm_os': 'focal',
741-
'llvm_ver': '12',
742-
},
743-
('freebsd', 'x86_64'): {
744-
'os_version': '13.1',
715+
'image': 'cppalliance/droneubuntu2004:1',
716+
'packages': ['clang-12'],
745717
},
746718
('linux', 'arm64'): {
747719
'image': 'cppalliance/droneubuntu2004:multiarch',
748-
'packages': ['clang-12', 'libstdc++-9-dev'],
749-
'llvm_os': 'focal',
750-
'llvm_ver': '12',
720+
'packages': ['clang-12'],
751721
},
722+
('freebsd', 'x86_64'): {'os_version': '13.1'},
752723
},
753724
},
754725
'11': {
755726
'latest_cpp': 2020,
756727
'platforms': {
757728
('linux', 'x86_64'): {
758-
'image': 'cppalliance/droneubuntu2204:1',
759-
'packages': ['clang-11', 'libstdc++-9-dev'],
760-
'llvm_os': 'bionic',
761-
'llvm_ver': '11',
762-
},
763-
('freebsd', 'x86_64'): {
764-
'os_version': '13.1',
729+
'image': 'cppalliance/droneubuntu2004:1',
730+
'packages': ['clang-11'],
765731
},
732+
('freebsd', 'x86_64'): {'os_version': '13.1'},
766733
},
767734
},
768735
'10': {
769736
'latest_cpp': 2020,
770737
'platforms': {
771738
('linux', 'x86_64'): {
772739
'image': 'cppalliance/droneubuntu1804:1',
773-
'packages': ['clang-10', 'libstdc++-9-dev'],
774-
'llvm_os': 'bionic',
775-
'llvm_ver': '10',
776-
},
777-
('freebsd', 'x86_64'): {
778-
'os_version': '13.1',
740+
'packages': ['clang-10'],
779741
},
742+
('freebsd', 'x86_64'): {'os_version': '13.1'},
780743
},
781744
},
782745
'9': {
@@ -785,9 +748,7 @@ _supported_compilers = {
785748
'platforms': {
786749
('linux', 'x86_64'): {
787750
'image': 'cppalliance/droneubuntu1804:1',
788-
'packages': ['clang-9', 'libstdc++-9-dev'],
789-
'llvm_os': 'bionic',
790-
'llvm_ver': '9',
751+
'packages': ['clang-9'],
791752
},
792753
},
793754
},
@@ -797,9 +758,7 @@ _supported_compilers = {
797758
'platforms': {
798759
('linux', 'x86_64'): {
799760
'image': 'cppalliance/droneubuntu1804:1',
800-
'packages': ['clang-8', 'libstdc++-8-dev'],
801-
'llvm_os': 'bionic',
802-
'llvm_ver': '8',
761+
'packages': ['clang-8'],
803762
},
804763
},
805764
},
@@ -809,9 +768,7 @@ _supported_compilers = {
809768
'platforms': {
810769
('linux', 'x86_64'): {
811770
'image': 'cppalliance/droneubuntu1804:1',
812-
'packages': ['clang-7', 'libstdc++-8-dev'],
813-
'llvm_os': 'bionic',
814-
'llvm_ver': '7',
771+
'packages': ['clang-7'],
815772
},
816773
},
817774
},
@@ -821,30 +778,25 @@ _supported_compilers = {
821778
'platforms': {
822779
('linux', 'x86_64'): {
823780
'image': 'cppalliance/droneubuntu1804:1',
824-
'packages': ['clang-6.0', 'libc6-dbg', 'libstdc++-8-dev'],
825-
'llvm_os': 'bionic',
826-
'llvm_ver': '6.0',
781+
'packages': ['clang-6.0'],
827782
},
828783
},
829784
},
830785
'5.0': {
831786
'latest_cpp': 2014,
832787
'platforms': {
833788
('linux', 'x86_64'): {
834-
'image': 'cppalliance/droneubuntu1804:1',
789+
'image': 'cppalliance/droneubuntu1604:1',
835790
'packages': ['clang-5.0'],
836-
'environment': {'UBUNTU_TOOLCHAIN_DISABLE': 'true'}
837791
},
838792
},
839793
},
840794
'4.0': {
841795
'latest_cpp': 2014,
842796
'platforms': {
843797
('linux', 'x86_64'): {
844-
'image': 'cppalliance/droneubuntu1804:1',
845-
'packages': ['clang-4.0', 'libstdc++-6-dev'],
846-
'llvm_os': 'xenial',
847-
'llvm_ver': '4.0',
798+
'image': 'cppalliance/droneubuntu1604:1',
799+
'packages': ['clang-4.0'],
848800
},
849801
},
850802
},
@@ -853,9 +805,7 @@ _supported_compilers = {
853805
'platforms': {
854806
('linux', 'x86_64'): {
855807
'image': 'cppalliance/droneubuntu1604:1',
856-
'packages': ['clang-3.8', 'g++'],
857-
'llvm_os': 'xenial',
858-
'llvm_ver': '3.8',
808+
'packages': ['clang-3.8'],
859809
},
860810
},
861811
},

0 commit comments

Comments
 (0)