From 8d69101350ac28b6a6c6ae778e7ce0cfe6af0ce8 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Sat, 26 Aug 2023 20:04:48 +0200 Subject: [PATCH] ci: compilers configuration adjusted to currently supported ones --- .github/workflows/ci-conan.yml | 133 ++++---------------- .github/workflows/ci-test-package-cmake.yml | 121 ++++-------------- 2 files changed, 47 insertions(+), 207 deletions(-) diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index 051e206b..4350ca8d 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -41,31 +41,18 @@ jobs: fail-fast: false matrix: config: - - { - name: "Windows MSVC 14.2", - os: windows-2019, - compiler: { type: VISUAL, version: 16, cc: "", cxx: "", std: 20 }, - conan-config: "-c user.build:skip_la=True", - } - - { - name: "Windows MSVC 14.3", - os: windows-2022, - compiler: { type: MSVC, version: 193, cc: "", cxx: "", std: 23 }, - conan-config: "", - } - - { - name: "Ubuntu GCC-10", - os: ubuntu-22.04, - compiler: - { - type: GCC, - version: 10, - cc: "gcc-10", - cxx: "g++-10", - std: 20, - }, - conan-config: "", - } + # - { + # name: "Windows MSVC 14.2", + # os: windows-2019, + # compiler: { type: VISUAL, version: 16, cc: "", cxx: "", std: 20 }, + # conan-config: "-c user.build:skip_la=True", + # } + # - { + # name: "Windows MSVC 14.3", + # os: windows-2022, + # compiler: { type: MSVC, version: 193, cc: "", cxx: "", std: 23 }, + # conan-config: "", + # } - { name: "Ubuntu GCC-11", os: ubuntu-22.04, @@ -92,76 +79,6 @@ jobs: }, conan-config: "", } - - { - name: "Ubuntu Clang-12 + libstdc++11", - os: ubuntu-20.04, - compiler: - { - type: CLANG, - version: 12, - cc: "clang-12", - cxx: "clang++-12", - std: 20, - }, - lib: "libstdc++11", - conan-config: "", - } - - { - name: "Ubuntu Clang-12 + libc++", - os: ubuntu-20.04, - compiler: - { - type: CLANG, - version: 12, - cc: "clang-12", - cxx: "clang++-12", - std: 20, - }, - lib: "libc++", - conan-config: "", - } - - { - name: "Ubuntu Clang-13 + libc++", - os: ubuntu-22.04, - compiler: - { - type: CLANG, - version: 13, - cc: "clang-13", - cxx: "clang++-13", - std: 20, - }, - lib: "libc++", - conan-config: "", - } - - { - name: "Ubuntu Clang-14 + libc++", - os: ubuntu-22.04, - compiler: - { - type: CLANG, - version: 14, - cc: "clang-14", - cxx: "clang++-14", - std: 20, - }, - lib: "libc++", - conan-config: "", - } - - { - name: "Ubuntu Clang-15 + libc++", - os: ubuntu-22.04, - compiler: - { - type: CLANG, - version: 15, - cc: "clang-15", - cxx: "clang++-15", - std: 20, - }, - lib: "libc++", - conan-config: "", - } - { name: "Ubuntu Clang-16 + libc++", os: ubuntu-22.04, @@ -176,19 +93,19 @@ jobs: lib: "libc++", conan-config: "", } - - { - name: "MacOS Apple Clang 13", - os: macos-11, - compiler: - { - type: APPLE_CLANG, - version: "13.0", - cc: "clang", - cxx: "clang++", - std: 20, - }, - conan-config: "", - } + # - { + # name: "MacOS Apple Clang 13", + # os: macos-11, + # compiler: + # { + # type: APPLE_CLANG, + # version: "13.0", + # cc: "clang", + # cxx: "clang++", + # std: 20, + # }, + # conan-config: "", + # } build_type: ["Release", "Debug"] env: diff --git a/.github/workflows/ci-test-package-cmake.yml b/.github/workflows/ci-test-package-cmake.yml index b6a9d747..006c3f58 100644 --- a/.github/workflows/ci-test-package-cmake.yml +++ b/.github/workflows/ci-test-package-cmake.yml @@ -42,28 +42,16 @@ jobs: fail-fast: false matrix: config: - - { - name: "Windows MSVC 14.2", - os: windows-2019, - compiler: { type: VISUAL, version: 16, cc: "", cxx: "", std: 20 }, - } - - { - name: "Windows MSVC 14.3", - os: windows-2022, - compiler: { type: MSVC, version: 193, cc: "", cxx: "", std: 23 }, - } - - { - name: "Ubuntu GCC-10", - os: ubuntu-22.04, - compiler: - { - type: GCC, - version: 10, - cc: "gcc-10", - cxx: "g++-10", - std: 20, - }, - } + # - { + # name: "Windows MSVC 14.2", + # os: windows-2019, + # compiler: { type: VISUAL, version: 16, cc: "", cxx: "", std: 20 }, + # } + # - { + # name: "Windows MSVC 14.3", + # os: windows-2022, + # compiler: { type: MSVC, version: 193, cc: "", cxx: "", std: 23 }, + # } - { name: "Ubuntu GCC-11", os: ubuntu-22.04, @@ -88,71 +76,6 @@ jobs: std: 20, }, } - - { - name: "Ubuntu Clang-12 + libstdc++11", - os: ubuntu-20.04, - compiler: - { - type: CLANG, - version: 12, - cc: "clang-12", - cxx: "clang++-12", - std: 20, - }, - lib: "libstdc++11", - } - - { - name: "Ubuntu Clang-12 + libc++", - os: ubuntu-20.04, - compiler: - { - type: CLANG, - version: 12, - cc: "clang-12", - cxx: "clang++-12", - std: 20, - }, - lib: "libc++", - } - - { - name: "Ubuntu Clang-13 + libc++", - os: ubuntu-22.04, - compiler: - { - type: CLANG, - version: 13, - cc: "clang-13", - cxx: "clang++-13", - std: 20, - }, - lib: "libc++", - } - - { - name: "Ubuntu Clang-14 + libc++", - os: ubuntu-22.04, - compiler: - { - type: CLANG, - version: 14, - cc: "clang-14", - cxx: "clang++-14", - std: 20, - }, - lib: "libc++", - } - - { - name: "Ubuntu Clang-15 + libc++", - os: ubuntu-22.04, - compiler: - { - type: CLANG, - version: 15, - cc: "clang-15", - cxx: "clang++-15", - std: 20, - }, - lib: "libc++", - } - { name: "Ubuntu Clang-16 + libc++", os: ubuntu-22.04, @@ -166,18 +89,18 @@ jobs: }, lib: "libc++", } - - { - name: "MacOS Apple Clang 13", - os: macos-11, - compiler: - { - type: APPLE_CLANG, - version: "13.0", - cc: "clang", - cxx: "clang++", - std: 20, - }, - } + # - { + # name: "MacOS Apple Clang 13", + # os: macos-11, + # compiler: + # { + # type: APPLE_CLANG, + # version: "13.0", + # cc: "clang", + # cxx: "clang++", + # std: 20, + # }, + # } build_type: ["Release", "Debug"] env: