From c869f8a9fa216869bf731c5daefc41b09012d34a Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Sun, 14 Aug 2022 14:20:34 +0300 Subject: [PATCH] Replaced ubuntu-18.04 GHA CI images with containers. Also use ubuntu-latest image for jobs that are running in a container. --- .github/workflows/ci.yml | 53 ++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9006a0e..5c55825 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -# Copyright 2021 Andrey Semashev +# Copyright 2021-2022 Andrey Semashev # # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt) @@ -35,7 +35,7 @@ jobs: # Linux, gcc - toolset: gcc-4.4 cxxstd: "98,0x" - os: ubuntu-20.04 + os: ubuntu-latest container: ubuntu:16.04 install: - g++-4.4 @@ -43,7 +43,7 @@ jobs: - "ppa:ubuntu-toolchain-r/test" - toolset: gcc-4.6 cxxstd: "03,0x" - os: ubuntu-20.04 + os: ubuntu-latest container: ubuntu:16.04 install: - g++-4.6 @@ -51,45 +51,50 @@ jobs: - "ppa:ubuntu-toolchain-r/test" - toolset: gcc-4.7 cxxstd: "03,11" - os: ubuntu-20.04 + os: ubuntu-latest container: ubuntu:16.04 install: - g++-4.7 - toolset: gcc-4.8 cxxstd: "03,11" - os: ubuntu-18.04 + os: ubuntu-latest + container: ubuntu:18.04 install: - g++-4.8 - toolset: gcc-4.9 cxxstd: "03,11" - os: ubuntu-20.04 + os: ubuntu-latest container: ubuntu:16.04 install: - g++-4.9 - toolset: gcc-5 cxxstd: "03,11,14,1z" - os: ubuntu-20.04 + os: ubuntu-latest container: ubuntu:16.04 install: - g++-5 - toolset: gcc-6 cxxstd: "03,11,14,1z" - os: ubuntu-18.04 + os: ubuntu-latest + container: ubuntu:18.04 install: - g++-6 - toolset: gcc-7 cxxstd: "03,11,14,17" - os: ubuntu-18.04 + os: ubuntu-latest + container: ubuntu:18.04 install: - g++-7 - toolset: gcc-8 cxxstd: "03,11,14,17,2a" - os: ubuntu-18.04 + os: ubuntu-latest + container: ubuntu:18.04 install: - g++-8 - toolset: gcc-9 cxxstd: "03,11,14,17,2a" - os: ubuntu-18.04 + os: ubuntu-latest + container: ubuntu:18.04 install: - g++-9 - toolset: gcc-10 @@ -119,66 +124,72 @@ jobs: - toolset: clang compiler: clang++-3.5 cxxstd: "03,11" - os: ubuntu-20.04 + os: ubuntu-latest container: ubuntu:16.04 install: - clang-3.5 - toolset: clang compiler: clang++-3.6 cxxstd: "03,11,14" - os: ubuntu-20.04 + os: ubuntu-latest container: ubuntu:16.04 install: - clang-3.6 - toolset: clang compiler: clang++-3.7 cxxstd: "03,11,14" - os: ubuntu-20.04 + os: ubuntu-latest container: ubuntu:16.04 install: - clang-3.7 - toolset: clang compiler: clang++-3.8 cxxstd: "03,11,14" - os: ubuntu-20.04 + os: ubuntu-latest container: ubuntu:16.04 install: - clang-3.8 - toolset: clang compiler: clang++-3.9 cxxstd: "03,11,14" - os: ubuntu-18.04 + os: ubuntu-latest + container: ubuntu:18.04 install: - clang-3.9 - toolset: clang compiler: clang++-4.0 cxxstd: "03,11,14" - os: ubuntu-18.04 + os: ubuntu-latest + container: ubuntu:18.04 install: - clang-4.0 - toolset: clang compiler: clang++-5.0 cxxstd: "03,11,14,1z" - os: ubuntu-18.04 + os: ubuntu-latest + container: ubuntu:18.04 install: - clang-5.0 - toolset: clang compiler: clang++-6.0 cxxstd: "03,11,14,17" - os: ubuntu-18.04 + os: ubuntu-latest + container: ubuntu:18.04 install: - clang-6.0 - toolset: clang compiler: clang++-7 cxxstd: "03,11,14,17" - os: ubuntu-18.04 + os: ubuntu-latest + container: ubuntu:18.04 install: - clang-7 # Note: clang-8 does not fully support C++20, so it is not compatible with libstdc++-8 in this mode - toolset: clang compiler: clang++-8 cxxstd: "03,11,14,17,2a" - os: ubuntu-18.04 + os: ubuntu-latest + container: ubuntu:18.04 install: - clang-8 - g++-7