From af19d99b70d2f4d6ff9047a545b44e9c95eca555 Mon Sep 17 00:00:00 2001 From: Christian Mazakas Date: Wed, 7 Jun 2023 09:53:06 -0700 Subject: [PATCH] Clean up CI to pre-debugging state --- .drone.jsonnet | 28 ---------------------------- .github/workflows/ci.yml | 8 ++++---- 2 files changed, 4 insertions(+), 32 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index fc149ca0..9ac670e2 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -300,34 +300,6 @@ local windows_pipeline(name, image, environment, arch = "amd64") = "g++-12-multilib", ), - linux_pipeline( - "Linux 22.04 GCC 12 64 UBASAN (03,11,14)", - "cppalliance/droneubuntu2204:1", - { TOOLSET: 'gcc', COMPILER: 'g++-12', CXXSTD: '03,11,14' } + ubsan + asan, - "g++-12-multilib", - ), - - linux_pipeline( - "Linux 22.04 GCC 12 64 UBASAN (17)", - "cppalliance/droneubuntu2204:1", - { TOOLSET: 'gcc', COMPILER: 'g++-12', CXXSTD: '17', ADDRMD: '64' } + ubsan + asan, - "g++-12-multilib", - ), - - linux_pipeline( - "Linux 22.04 GCC 12 64 UBASAN (20)", - "cppalliance/droneubuntu2204:1", - { TOOLSET: 'gcc', COMPILER: 'g++-12', CXXSTD: '20', ADDRMD: '64' } + ubsan + asan, - "g++-12-multilib", - ), - - linux_pipeline( - "Linux 22.04 GCC 12 64 UBASAN (2b)", - "cppalliance/droneubuntu2204:1", - { TOOLSET: 'gcc', COMPILER: 'g++-12', CXXSTD: '2b', ADDRMD: '64' } + ubsan + asan, - "g++-12-multilib", - ), - linux_pipeline( "Linux 23.04 GCC 13 32/64 (03,11,14)", "cppalliance/droneubuntu2304:1", diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 712b3824..96dfa72a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,10 +46,10 @@ jobs: - { compiler: gcc-9, cxxstd: '03,11,14,17', os: ubuntu-20.04, install: 'g++-9' } - { compiler: gcc-10, cxxstd: '03,11,14,17,20', os: ubuntu-22.04, install: 'g++-10' } - { compiler: gcc-11, cxxstd: '03,11,14,17,20', os: ubuntu-22.04, install: 'g++-11' } - - { name: "gcc-12 w/ sanitizers (03,11,14)", sanitize: yes, ccache: no, - compiler: gcc-12, cxxstd: '03,11,14', os: ubuntu-22.04 } - - { name: "gcc-12 w/ sanitizers (17,20,2b)", sanitize: yes, ccache: no, - compiler: gcc-12, cxxstd: '17,20,2b', os: ubuntu-22.04 } + - { name: "gcc-12 w/ sanitizers (03,11,14)", sanitize: yes, + compiler: gcc-12, cxxstd: '03,11,14', os: ubuntu-22.04, ccache_key: "san1" } + - { name: "gcc-12 w/ sanitizers (17,20,2b)", sanitize: yes, + compiler: gcc-12, cxxstd: '17,20,2b', os: ubuntu-22.04, ccache_key: "san2" } - { name: Collect coverage, coverage: yes, compiler: gcc-12, cxxstd: '03,20', os: ubuntu-22.04, install: 'g++-12-multilib', address-model: '32,64', ccache_key: "cov" }