From 4791fcb8babca514927196dcb2deaf5031bc265c Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Sun, 14 Aug 2022 17:40:05 -0400 Subject: [PATCH] ci: refresh GitHub Actions matrix * Add ubuntu-22.04, remove 18.04 * Add macos-12, remove 10.15 Change-Id: I775ea45661259ba1353e3f6ee0c602abee58acbd --- .github/workflows/ci.yml | 34 ++++++++++++++++++++-------------- .github/workflows/docs.yml | 4 ++-- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 15841e62..21e8948c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,18 +13,22 @@ permissions: jobs: linux: name: ${{ matrix.compiler }} on ${{ matrix.os }} + runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: - compiler: [g++-8, g++-9, g++-10, g++-11, - clang++-7, clang++-8, clang++-9, clang++-10, clang++-11, clang++-12] os: [ubuntu-20.04] + compiler: [g++-7, g++-8, g++-9, g++-10, + clang++-7, clang++-8, clang++-9, clang++-10, clang++-11, clang++-12] include: - - compiler: g++-7 - os: ubuntu-18.04 - - compiler: clang++-6.0 - os: ubuntu-18.04 - runs-on: ${{ matrix.os }} + - os: ubuntu-22.04 + compiler: g++-11 + - os: ubuntu-22.04 + compiler: g++-12 + - os: ubuntu-22.04 + compiler: clang++-13 + - os: ubuntu-22.04 + compiler: clang++-14 env: CXX: ${{ matrix.compiler }} steps: @@ -34,22 +38,22 @@ jobs: ${CXX} --version - name: Checkout uses: actions/checkout@v3 + with: + submodules: true - name: Build and test run: ./.jenkins macos: name: Xcode ${{ matrix.xcode }} on ${{ matrix.os }} + runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: - xcode: ['11.3', '11.7', '12.4'] - os: [macos-10.15] + os: [macos-11] + xcode: ['12.4', '12.5', '13.2'] include: - - xcode: '12.5' - os: macos-11 - - xcode: '13.2' - os: macos-11 - runs-on: ${{ matrix.os }} + - os: macos-12 + xcode: '13.4' steps: - name: Set up Xcode uses: maxim-lobanov/setup-xcode@v1 @@ -57,5 +61,7 @@ jobs: xcode-version: ${{ matrix.xcode }} - name: Checkout uses: actions/checkout@v3 + with: + submodules: true - name: Build and test run: ./.jenkins diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index f878d721..9106b1fb 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -11,11 +11,11 @@ permissions: jobs: build: + runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: - os: [macos-11, ubuntu-20.04] - runs-on: ${{ matrix.os }} + os: [macos-12, ubuntu-20.04] env: JOB_NAME: Docs steps: