From c1f8720dd23fbbeb4ecd873964a4196e6f986f47 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Wed, 31 Jan 2024 18:17:05 +0200 Subject: [PATCH] Add GCC 5 on 18.04 to Drone and GHA --- .drone.jsonnet | 7 +++++++ .github/workflows/ci.yml | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 154007f9..3ed85fc4 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -120,6 +120,13 @@ local windows_pipeline(name, image, environment, arch = "amd64") = { TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '11,14', ADDRMD: '32,64' }, ), + linux_pipeline( + "Linux 18.04 GCC 5 32/64", + "cppalliance/droneubuntu1804:1", + { TOOLSET: 'gcc', COMPILER: 'g++-5', CXXSTD: '11,14', ADDRMD: '32,64' }, + "g++-5-multilib", + ), + linux_pipeline( "Linux 18.04 GCC 6 32/64", "cppalliance/droneubuntu1804:1", diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bbd54960..15c8247c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,6 +52,7 @@ jobs: matrix: include: # Linux, gcc + - { compiler: gcc-5, cxxstd: '11,14', os: 'ubuntu-18.04', install: 'g++-5' } - { compiler: gcc-7, cxxstd: '11,14,17', os: 'ubuntu-20.04', install: 'g++-7' } - { compiler: gcc-8, cxxstd: '11,14,17', os: 'ubuntu-20.04', install: 'g++-8' } - { compiler: gcc-9, cxxstd: '11,14,17', os: 'ubuntu-22.04', install: 'g++-9' } @@ -174,7 +175,7 @@ jobs: SOURCE_KEYS=(${{join(matrix.source_keys, ' ')}}) SOURCES=(${{join(matrix.sources, ' ')}}) # Add this by default - SOURCES+=(ppa:ubuntu-toolchain-r/test) + # SOURCES+=(ppa:ubuntu-toolchain-r/test) for key in "${SOURCE_KEYS[@]}"; do for i in {1..$NET_RETRY_COUNT}; do wget -O - "$key" | sudo apt-key add - && break || sleep 10