From 48265f0d4eee99c76de13f8d3ddaa4a4c2b8ac86 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Wed, 4 Jan 2023 20:40:12 +0100 Subject: [PATCH] ci: gcc-12 support added --- .github/workflows/ci-check.yml | 26 ++++++++--------- .github/workflows/ci-conan.yml | 31 +++++++++++++++------ .github/workflows/ci-test-package-cmake.yml | 27 +++++++++++++----- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/documentation.yml | 2 +- 5 files changed, 57 insertions(+), 31 deletions(-) diff --git a/.github/workflows/ci-check.yml b/.github/workflows/ci-check.yml index dab79c62..53c99c66 100644 --- a/.github/workflows/ci-check.yml +++ b/.github/workflows/ci-check.yml @@ -26,17 +26,17 @@ on: [push, pull_request] jobs: check: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 - - name: Set up Python 3.8 - uses: actions/setup-python@v4 - with: - python-version: 3.8 - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install -r requirements.txt - - name: Check - run: | - pre-commit run --all-files + - uses: actions/checkout@v3 + - name: Set up Python 3.8 + uses: actions/setup-python@v4 + with: + python-version: 3.8 + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -r requirements.txt + - name: Check + run: | + pre-commit run --all-files diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index 255dbebd..09026c16 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -50,7 +50,7 @@ jobs: } - { name: "Ubuntu GCC-10", - os: ubuntu-20.04, + os: ubuntu-22.04, compiler: { type: GCC, @@ -63,7 +63,7 @@ jobs: } - { name: "Ubuntu GCC-11", - os: ubuntu-20.04, + os: ubuntu-22.04, compiler: { type: GCC, @@ -74,9 +74,22 @@ jobs: }, lib: "libstdc++11", } + - { + name: "Ubuntu GCC-12", + os: ubuntu-22.04, + compiler: + { + type: GCC, + version: 12, + cc: "gcc-12", + cxx: "g++-12", + std: 20, + }, + lib: "libstdc++11", + } - { name: "Ubuntu Clang-12 + libstdc++11", - os: ubuntu-20.04, + os: ubuntu-22.04, compiler: { type: CLANG, @@ -89,7 +102,7 @@ jobs: } - { name: "Ubuntu Clang-12 + libc++", - os: ubuntu-20.04, + os: ubuntu-22.04, compiler: { type: CLANG, @@ -102,7 +115,7 @@ jobs: } - { name: "Ubuntu Clang-13 + libc++", - os: ubuntu-20.04, + os: ubuntu-22.04, compiler: { type: CLANG, @@ -115,7 +128,7 @@ jobs: } - { name: "Ubuntu Clang-14 + libc++", - os: ubuntu-20.04, + os: ubuntu-22.04, compiler: { type: CLANG, @@ -128,7 +141,7 @@ jobs: } - { name: "Ubuntu Clang-15 + libc++", - os: ubuntu-20.04, + os: ubuntu-22.04, compiler: { type: CLANG, @@ -176,8 +189,8 @@ jobs: with: key: ${{ matrix.config.os }}-${{ matrix.config.compiler.type }}-${{ matrix.config.compiler.version }}-${{ matrix.config.lib }}-${{ matrix.build_type }}-${{ matrix.downcast_mode }} max-size: 50M - - name: Install gcc-11 - if: matrix.config.compiler.type == 'GCC' && matrix.config.compiler.version == '11' + - name: Install gcc-12 + if: matrix.config.compiler.type == 'GCC' && matrix.config.compiler.version == '12' shell: bash run: | sudo apt install -y g++-${{ matrix.config.compiler.version }} diff --git a/.github/workflows/ci-test-package-cmake.yml b/.github/workflows/ci-test-package-cmake.yml index 645220d5..37e4a5fd 100644 --- a/.github/workflows/ci-test-package-cmake.yml +++ b/.github/workflows/ci-test-package-cmake.yml @@ -54,7 +54,7 @@ jobs: } - { name: "Ubuntu GCC-10", - os: ubuntu-20.04, + os: ubuntu-22.04, compiler: { type: GCC, @@ -67,7 +67,7 @@ jobs: } - { name: "Ubuntu GCC-11", - os: ubuntu-20.04, + os: ubuntu-22.04, compiler: { type: GCC, @@ -78,9 +78,22 @@ jobs: }, lib: "libstdc++11", } + - { + name: "Ubuntu GCC-12", + os: ubuntu-22.04, + compiler: + { + type: GCC, + version: 12, + cc: "gcc-12", + cxx: "g++-12", + std: 20, + }, + lib: "libstdc++11", + } - { name: "Ubuntu Clang-12 + libstdc++11", - os: ubuntu-20.04, + os: ubuntu-22.04, compiler: { type: CLANG, @@ -93,7 +106,7 @@ jobs: } - { name: "Ubuntu Clang-12 + libc++", - os: ubuntu-20.04, + os: ubuntu-22.04, compiler: { type: CLANG, @@ -106,7 +119,7 @@ jobs: } - { name: "Ubuntu Clang-13 + libc++", - os: ubuntu-20.04, + os: ubuntu-22.04, compiler: { type: CLANG, @@ -119,7 +132,7 @@ jobs: } - { name: "Ubuntu Clang-14 + libc++", - os: ubuntu-20.04, + os: ubuntu-22.04, compiler: { type: CLANG, @@ -132,7 +145,7 @@ jobs: } - { name: "Ubuntu Clang-15 + libc++", - os: ubuntu-20.04, + os: ubuntu-22.04, compiler: { type: CLANG, diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 7322bbef..ee26cd5d 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -25,7 +25,7 @@ on: jobs: analyze: name: Analyze - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 env: CC: gcc-10 CXX: g++-10 diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index f42de3b8..b80ec678 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -45,7 +45,7 @@ env: jobs: docs: name: Generate documentation - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - name: Cache Conan data