From 721b28f3fde293538c1f724e9fbfe570becc6923 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Tue, 4 Mar 2025 16:20:16 +0100 Subject: [PATCH] compiler-zoo.yml: Switch to ubuntu-22.04 where possible And drop the rest. The ubuntu-20.04 CI runners are discontinued. Reviewed-by: Tim Hudson Reviewed-by: Neil Horman (Merged from https://github.com/openssl/openssl/pull/26971) (cherry picked from commit 4e9b542868890428f0294a4ce53fcde68c1fcaf7) --- .github/workflows/compiler-zoo.yml | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/.github/workflows/compiler-zoo.yml b/.github/workflows/compiler-zoo.yml index 4b500b12f77..4bc3a1bf657 100644 --- a/.github/workflows/compiler-zoo.yml +++ b/.github/workflows/compiler-zoo.yml @@ -19,17 +19,11 @@ jobs: matrix: zoo: [ { - cc: gcc-7, - distro: ubuntu-20.04 - }, { - cc: gcc-8, - distro: ubuntu-20.04 - }, { cc: gcc-9, - distro: ubuntu-20.04 + distro: ubuntu-22.04 }, { cc: gcc-10, - distro: ubuntu-20.04 + distro: ubuntu-22.04 }, { cc: gcc-11, distro: ubuntu-22.04 @@ -40,27 +34,12 @@ jobs: cc: gcc-13, distro: ubuntu-22.04, gcc-ppa-name: ubuntu-toolchain-r/test - }, { - cc: clang-6.0, - distro: ubuntu-20.04 - }, { - cc: clang-7, - distro: ubuntu-20.04 - }, { - cc: clang-8, - distro: ubuntu-20.04 - }, { - cc: clang-9, - distro: ubuntu-20.04 - }, { - cc: clang-10, - distro: ubuntu-20.04 }, { cc: clang-11, - distro: ubuntu-20.04 + distro: ubuntu-22.04 }, { cc: clang-12, - distro: ubuntu-20.04 + distro: ubuntu-22.04 }, { cc: clang-13, distro: ubuntu-22.04 -- 2.47.2